diff --git a/.agents/skills/add-block/SKILL.md b/.agents/skills/add-block/SKILL.md index 82cf55267f0..3f8c86f5fc7 100644 --- a/.agents/skills/add-block/SKILL.md +++ b/.agents/skills/add-block/SKILL.md @@ -350,7 +350,7 @@ sourceIds.forEach((id) => delete params[id]) // subblock ids are deleted if (chosen !== undefined) params[group.canonicalId] = chosen ``` -So by the time `tools.config.params(inputs)` runs (`executor/handlers/generic/generic-handler.ts`), +So by the time `tools.config.params(inputs)` runs (`executor/handlers/generic/handler.ts`), `params.uploadFile` and `params.fileRef` are **gone** and the value is under `params.file`. Reading a subblock id there yields `undefined` and silently sends no file. @@ -359,7 +359,7 @@ and the first non-empty advanced value in advanced mode, so a stale value in the never leak. `normalizeFileInput` then handles the JSON string that advanced-mode template resolution produces. -Note that `generic-handler` merges rather than replaces (`{ ...inputs, ...transformedParams }`), so +Note that `generic/handler` merges rather than replaces (`{ ...inputs, ...transformedParams }`), so omitting a key from the returned object does not strip it from what the tool receives. Tools simply ignore params they do not declare. diff --git a/.agents/skills/add-integration/SKILL.md b/.agents/skills/add-integration/SKILL.md index 94ab90181b0..71aa71c8b2c 100644 --- a/.agents/skills/add-integration/SKILL.md +++ b/.agents/skills/add-integration/SKILL.md @@ -657,8 +657,8 @@ File Downloads and Generated Files. | Helper | Location | Purpose | |--------|----------|---------| | `normalizeFileInput` | `@/blocks/utils` | Normalize file params in block config | -| `processFilesToUserFiles` | `@/lib/uploads/utils/file-utils` | Convert raw inputs to UserFile[] | -| `downloadFileFromStorage` | `@/lib/uploads/utils/file-utils.server` | Get file Buffer from UserFile | +| `processFilesToUserFiles` | `@/lib/uploads/utils/file` | Convert raw inputs to UserFile[] | +| `downloadFileFromStorage` | `@/lib/uploads/utils/file.server` | Get file Buffer from UserFile | | `FileToolProcessor` | `@/executor/utils/file-tool-processor` | Executor-side; stores declared file outputs (not called by tools) | | `isUserFile` | `@/lib/core/utils/user-file` | Type guard for UserFile objects | | `FileInputSchema` | `@/lib/uploads/utils/file-schemas` | Zod schema for file validation | diff --git a/.agents/skills/add-managed-cli/SKILL.md b/.agents/skills/add-managed-cli/SKILL.md index c5bb3c9d0bf..325dae43e31 100644 --- a/.agents/skills/add-managed-cli/SKILL.md +++ b/.agents/skills/add-managed-cli/SKILL.md @@ -15,7 +15,7 @@ Read these live sources before editing; do not copy their current entries into t 2. `apps/sim/lib/execution/remote-sandbox/cli-tools.server.ts` — server-only recipes and recipe helpers. 3. `apps/sim/lib/execution/remote-sandbox/cli-tools.test.ts` — catalog and supply-chain invariants. 4. `apps/sim/lib/execution/remote-sandbox/cli-tools-boundary.test.ts` — client/server import boundary. -5. `apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts` — content-addressed hash inputs. +5. `apps/sim/lib/execution/remote-sandbox/spec.ts` — content-addressed hash inputs. Read `resolve.ts` and `e2b.ts` only when changing provisioning mechanics. A normal catalog addition should not require UI, API, database, resolver, or provider edits; those paths derive from the registries. @@ -114,7 +114,7 @@ Never commit downloaded artifacts or credentials. bun run --cwd apps/sim test \ lib/execution/remote-sandbox/cli-tools.test.ts \ lib/execution/remote-sandbox/cli-tools-boundary.test.ts \ - lib/execution/remote-sandbox/sandbox-spec.test.ts \ + lib/execution/remote-sandbox/spec.test.ts \ lib/execution/remote-sandbox/resolve.test.ts \ 'app/workspace/[workspaceId]/settings/components/sandboxes/utils.test.ts' ``` diff --git a/.agents/skills/migrate-application-operation/SKILL.md b/.agents/skills/migrate-application-operation/SKILL.md index 2cf8fcb518f..c057b86b35d 100644 --- a/.agents/skills/migrate-application-operation/SKILL.md +++ b/.agents/skills/migrate-application-operation/SKILL.md @@ -47,7 +47,7 @@ Read these files completely before editing: - `apps/sim/lib/api/server/routes/internal-json-route.ts` - `apps/sim/lib/api/server/routes/v2-json-route.ts` - `apps/sim/lib/auth/internal-delegation.ts` -- `apps/sim/lib/mothership/application/application-adapter.ts` +- `apps/sim/lib/mothership/application/adapter.ts` - `apps/sim/lib/mothership/auth/application-delegation.ts` Use the file domain only as a representative golden slice: diff --git a/.claude/rules/sim-sandbox.md b/.claude/rules/sim-sandbox.md index 72768e4210e..e696f04f843 100644 --- a/.claude/rules/sim-sandbox.md +++ b/.claude/rules/sim-sandbox.md @@ -4,7 +4,7 @@ paths: - "apps/sim/lib/execution/isolated-vm-worker.cjs" - "apps/sim/lib/execution/isolated-vm.ts" - "apps/sim/lib/execution/sandbox/**" - - "apps/sim/sandbox-tasks/**" + - "apps/sim/sandboxes/**" --- # Sim Sandbox — Worker Security Policy @@ -40,7 +40,7 @@ about what must **never** live in that process. validation. 4. **Nothing that runs in the isolate is trusted, even if we wrote it**. The - task `bootstrap` and `finalize` strings in `apps/sim/sandbox-tasks/` execute + task `bootstrap` and `finalize` strings in `apps/sim/sandboxes/` execute inside the isolate. They must treat `globalThis` as adversarial — no pulling values from it that might have been mutated by user code. The hardening script in `executeTask` undefines dangerous globals before user code runs. diff --git a/.cursor/rules/sim-sandbox.mdc b/.cursor/rules/sim-sandbox.mdc index 1699f9dda5c..351c4e74292 100644 --- a/.cursor/rules/sim-sandbox.mdc +++ b/.cursor/rules/sim-sandbox.mdc @@ -1,6 +1,6 @@ --- description: "Isolated-vm sandbox worker security policy. Hard rules for anything that lives in the worker child process that runs user code." -globs: ["apps/sim/lib/execution/isolated-vm-worker.cjs","apps/sim/lib/execution/isolated-vm.ts","apps/sim/lib/execution/sandbox/**","apps/sim/sandbox-tasks/**"] +globs: ["apps/sim/lib/execution/isolated-vm-worker.cjs","apps/sim/lib/execution/isolated-vm.ts","apps/sim/lib/execution/sandbox/**","apps/sim/sandboxes/**"] --- @@ -38,7 +38,7 @@ about what must **never** live in that process. validation. 4. **Nothing that runs in the isolate is trusted, even if we wrote it**. The - task `bootstrap` and `finalize` strings in `apps/sim/sandbox-tasks/` execute + task `bootstrap` and `finalize` strings in `apps/sim/sandboxes/` execute inside the isolate. They must treat `globalThis` as adversarial — no pulling values from it that might have been mutated by user code. The hardening script in `executeTask` undefines dangerous globals before user code runs. diff --git a/apps/sim/app/(auth)/login/login-form.tsx b/apps/sim/app/(auth)/login/login-form.tsx index 061f68b6b0e..6a90ef7053f 100644 --- a/apps/sim/app/(auth)/login/login-form.tsx +++ b/apps/sim/app/(auth)/login/login-form.tsx @@ -15,7 +15,7 @@ import { normalizeEmail } from '@sim/utils/string' import { useRouter, useSearchParams } from 'next/navigation' import { requestJson } from '@/lib/api/client/request' import { forgetPasswordContract } from '@/lib/api/contracts' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { getEnv, isFalsy } from '@/lib/core/config/env' import { isSsoEnabled } from '@/lib/core/config/env-flags' import { validateCallbackUrl } from '@/lib/core/security/input-validation' diff --git a/apps/sim/app/(auth)/oauth/consent/consent-view.test.tsx b/apps/sim/app/(auth)/oauth/consent/consent-view.test.tsx index 37a8c9bbb09..41711bd2f6a 100644 --- a/apps/sim/app/(auth)/oauth/consent/consent-view.test.tsx +++ b/apps/sim/app/(auth)/oauth/consent/consent-view.test.tsx @@ -7,7 +7,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { OAuthConsentView } from '@/app/(auth)/oauth/consent/consent-view' import { oauthProviderKeys } from '@/hooks/queries/oauth-provider' diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx index 844c595251c..8eedc7f0d91 100644 --- a/apps/sim/app/(auth)/signup/signup-form.tsx +++ b/apps/sim/app/(auth)/signup/signup-form.tsx @@ -7,7 +7,7 @@ import { useRouter, useSearchParams } from 'next/navigation' import { usePostHog } from 'posthog-js/react' import { trackFreebuffConversion } from '@/lib/analytics/freebuff' import { trackGoogleEvent } from '@/lib/analytics/google' -import { client, useSession } from '@/lib/auth/auth-client' +import { client, useSession } from '@/lib/auth/client' import { useTrackingConsent } from '@/lib/consent/tracking-consent' import { getEnv, isFalsy } from '@/lib/core/config/env' import { isSsoEnabled } from '@/lib/core/config/env-flags' diff --git a/apps/sim/app/(auth)/verify/use-verification.test.tsx b/apps/sim/app/(auth)/verify/use-verification.test.tsx index dc137e67a72..2a78c1e29a1 100644 --- a/apps/sim/app/(auth)/verify/use-verification.test.tsx +++ b/apps/sim/app/(auth)/verify/use-verification.test.tsx @@ -6,7 +6,7 @@ import { nextNavigationMock } from '@sim/testing/mocks/next-navigation.mock' import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('next/navigation', () => nextNavigationMock) import { useVerification } from '@/app/(auth)/verify/use-verification' diff --git a/apps/sim/app/(auth)/verify/use-verification.ts b/apps/sim/app/(auth)/verify/use-verification.ts index 4d1274412b7..1c52d52ebf3 100644 --- a/apps/sim/app/(auth)/verify/use-verification.ts +++ b/apps/sim/app/(auth)/verify/use-verification.ts @@ -4,7 +4,7 @@ import { useEffect, useState } from 'react' import { createLogger } from '@sim/logger' import { normalizeEmail } from '@sim/utils/string' import { useSearchParams } from 'next/navigation' -import { client, useSession } from '@/lib/auth/auth-client' +import { client, useSession } from '@/lib/auth/client' import { SSO_REQUIRED_ERROR_CODE } from '@/lib/auth/constants' import { validateCallbackUrl } from '@/lib/core/security/input-validation' import { DEFAULT_POST_AUTH_ROUTE, POST_AUTH_REDIRECT_STORAGE_KEY } from '@/app/(auth)/auth-redirect' diff --git a/apps/sim/app/(interfaces)/chat/components/message/components/file-download.tsx b/apps/sim/app/(interfaces)/chat/components/message/components/file-download.tsx index 938ea3f2b3c..43a0e2fd1c0 100644 --- a/apps/sim/app/(interfaces)/chat/components/message/components/file-download.tsx +++ b/apps/sim/app/(interfaces)/chat/components/message/components/file-download.tsx @@ -8,7 +8,7 @@ import { sleep } from '@sim/utils/helpers' import { getDocumentIcon } from '@/components/icons/document-icons' import { isSafeHttpUrl } from '@/lib/core/utils/urls' import { saveBlob } from '@/lib/uploads/client/download' -import { tryInferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { tryInferContextFromKey } from '@/lib/uploads/utils/file' import type { ChatFile } from '@/app/(interfaces)/chat/components/message/message' const logger = createLogger('ChatFileDownload') diff --git a/apps/sim/app/(landing)/components/hero/components/hero-chat-loop/hero-tool-call-item.tsx b/apps/sim/app/(landing)/components/hero/components/hero-chat-loop/hero-tool-call-item.tsx index 19c6ec5ba45..6d7233618c4 100644 --- a/apps/sim/app/(landing)/components/hero/components/hero-chat-loop/hero-tool-call-item.tsx +++ b/apps/sim/app/(landing)/components/hero/components/hero-chat-loop/hero-tool-call-item.tsx @@ -1,10 +1,7 @@ import { Table } from '@sim/emcn/icons' import { SlackIcon } from '@/components/icons' import { ActivityStatus } from '@/components/ui/activity-status' -import { - getToolInProgressTitle, - getToolStatusDisplayTitle, -} from '@/lib/mothership/tools/tool-display' +import { getToolInProgressTitle, getToolStatusDisplayTitle } from '@/lib/mothership/tools/display' import type { ToolActivityPresentation, ToolCallItemProps, diff --git a/apps/sim/app/_shell/providers/browser-telemetry.test.tsx b/apps/sim/app/_shell/providers/browser-telemetry.test.tsx index d9c0ad2a0a9..48869d7ddea 100644 --- a/apps/sim/app/_shell/providers/browser-telemetry.test.tsx +++ b/apps/sim/app/_shell/providers/browser-telemetry.test.tsx @@ -21,7 +21,7 @@ const { session, consent, settings, start, stop } = vi.hoisted(() => { } }) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/consent/tracking-consent', () => ({ useTrackingConsent: () => consent })) vi.mock('@/hooks/queries/general-settings', () => ({ useGeneralSettings: () => settings })) vi.mock('@/lib/telemetry/browser', () => ({ startBrowserTelemetry: start })) diff --git a/apps/sim/app/_shell/providers/browser-telemetry.tsx b/apps/sim/app/_shell/providers/browser-telemetry.tsx index 3afebd66b0a..75422821d1b 100644 --- a/apps/sim/app/_shell/providers/browser-telemetry.tsx +++ b/apps/sim/app/_shell/providers/browser-telemetry.tsx @@ -1,7 +1,7 @@ 'use client' import { useEffect, useSyncExternalStore } from 'react' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getStoredMeasurementPermission, subscribeStoredMeasurementPermission, diff --git a/apps/sim/app/_shell/providers/session-provider.test.tsx b/apps/sim/app/_shell/providers/session-provider.test.tsx index b4040ccbb60..4f6df2a46eb 100644 --- a/apps/sim/app/_shell/providers/session-provider.test.tsx +++ b/apps/sim/app/_shell/providers/session-provider.test.tsx @@ -8,7 +8,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { createRoot, type Root } from 'react-dom/client' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('posthog-js', () => ({ default: { diff --git a/apps/sim/app/_shell/providers/session-provider.tsx b/apps/sim/app/_shell/providers/session-provider.tsx index 22f110a0eb1..96db371eed3 100644 --- a/apps/sim/app/_shell/providers/session-provider.tsx +++ b/apps/sim/app/_shell/providers/session-provider.tsx @@ -4,7 +4,7 @@ import type React from 'react' import { createContext, useEffect, useMemo } from 'react' import { createLogger } from '@sim/logger' import { useQueryClient } from '@tanstack/react-query' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { type AppSession, extractSessionDataFromAuthClientResult, diff --git a/apps/sim/app/api/billing/update-cost/route.integration.ts b/apps/sim/app/api/billing/update-cost/route.integration.ts index 6263a693d6a..014ac9f70e6 100644 --- a/apps/sim/app/api/billing/update-cost/route.integration.ts +++ b/apps/sim/app/api/billing/update-cost/route.integration.ts @@ -25,7 +25,7 @@ vi.mock('@/lib/mothership/request/http', async (importOriginal) => ({ import { BILLING_ACCOUNT_DECISION_HEADER, serializeAccountBillingDecisionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { claimTerminalPeriod } from '@/lib/billing/cycle-close' import { POST } from '@/app/api/billing/update-cost/route' diff --git a/apps/sim/app/api/billing/update-cost/route.test.ts b/apps/sim/app/api/billing/update-cost/route.test.ts index 064e1f1ecb9..29f86b66aea 100644 --- a/apps/sim/app/api/billing/update-cost/route.test.ts +++ b/apps/sim/app/api/billing/update-cost/route.test.ts @@ -46,7 +46,7 @@ vi.mock('@/lib/mothership/request/otel', () => mothershipOtelMock) vi.mock('@/lib/billing/core/usage-log', () => billingUsageLogMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/billing', () => billingCoreMock) diff --git a/apps/sim/app/api/billing/update-cost/route.ts b/apps/sim/app/api/billing/update-cost/route.ts index 0c66f9fc346..f7d2ef16fe3 100644 --- a/apps/sim/app/api/billing/update-cost/route.ts +++ b/apps/sim/app/api/billing/update-cost/route.ts @@ -21,7 +21,7 @@ import { requireBillingCallbackAttribution, resolveLegacyV0BillingAttribution, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { type MidRunUsageVerdict, readMidRunAccountUsageVerdict, diff --git a/apps/sim/app/api/chat/manage/[id]/route.test.ts b/apps/sim/app/api/chat/manage/[id]/route.test.ts index 441d90ff032..c232ceeb956 100644 --- a/apps/sim/app/api/chat/manage/[id]/route.test.ts +++ b/apps/sim/app/api/chat/manage/[id]/route.test.ts @@ -48,7 +48,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/chat-deployments/queries', () => ({ getChatDeploymentWithWorkspace: mocks.getChatDeploymentWithWorkspace, getChatDeploymentIdOwningIdentifier: mocks.getIdentifierOwner, diff --git a/apps/sim/app/api/copilot/api-keys/validate/route.test.ts b/apps/sim/app/api/copilot/api-keys/validate/route.test.ts index 9c2188b9ac8..2a7ebe9d956 100644 --- a/apps/sim/app/api/copilot/api-keys/validate/route.test.ts +++ b/apps/sim/app/api/copilot/api-keys/validate/route.test.ts @@ -95,8 +95,8 @@ const SELF_HOSTED_OPAQUE_WORKSPACE_VALIDATE_BODY = { workspaceId: 'local-self-hosted-workspace', } as const -vi.mock('@/lib/billing/core/billing-attribution', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/lib/billing/core/attribution', async (importOriginal) => ({ + ...(await importOriginal()), BILLING_ACCOUNT_DECISION_HEADER: 'x-sim-billing-account-decision', BILLING_ATTRIBUTION_HEADER: 'x-sim-billing-attribution', BILLING_REQUEST_ID_HEADER: 'x-sim-billing-request-id', diff --git a/apps/sim/app/api/copilot/api-keys/validate/route.ts b/apps/sim/app/api/copilot/api-keys/validate/route.ts index 0a1373dea56..ad9509666f8 100644 --- a/apps/sim/app/api/copilot/api-keys/validate/route.ts +++ b/apps/sim/app/api/copilot/api-keys/validate/route.ts @@ -25,7 +25,7 @@ import { resolveOrganizationBillingAttribution, serializeAccountBillingDecisionHeader, serializeBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { readMidRunAccountUsageVerdict, readMidRunUsageVerdict, diff --git a/apps/sim/app/api/copilot/chat/abort/route.test.ts b/apps/sim/app/api/copilot/chat/abort/route.test.ts index 866eb28a27c..a3f9bc1f8b0 100644 --- a/apps/sim/app/api/copilot/chat/abort/route.test.ts +++ b/apps/sim/app/api/copilot/chat/abort/route.test.ts @@ -65,7 +65,7 @@ vi.mock('@/lib/mothership/request/session/explicit-abort', () => ({ const { mockChatContext } = vi.hoisted(() => ({ mockChatContext: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/auth/ban', () => authBanMock) vi.mock('@/lib/mothership/chat/application/context', () => ({ resolveOwnedChatContext: mockChatContext, diff --git a/apps/sim/app/api/credentials/[id]/members/route.test.ts b/apps/sim/app/api/credentials/[id]/members/route.test.ts index bbe41e0694e..b7960846808 100644 --- a/apps/sim/app/api/credentials/[id]/members/route.test.ts +++ b/apps/sim/app/api/credentials/[id]/members/route.test.ts @@ -22,7 +22,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/credentials/members', () => ({ leaveCredentialMembership: vi.fn(), listCredentialMembers: mocks.listMembers, diff --git a/apps/sim/app/api/credentials/[id]/members/route.ts b/apps/sim/app/api/credentials/[id]/members/route.ts index 07e15694921..365def99563 100644 --- a/apps/sim/app/api/credentials/[id]/members/route.ts +++ b/apps/sim/app/api/credentials/[id]/members/route.ts @@ -17,7 +17,7 @@ import { listCredentialMembersUseCase, removeCredentialMemberUseCase, upsertCredentialMemberUseCase, -} from '@/lib/credentials/application/credential-members' +} from '@/lib/credentials/application/members' import { credentialOperations } from '@/lib/credentials/application/operations' const rateLimit = internalRateLimits.none({ reason: 'Preserve existing internal behavior' }) diff --git a/apps/sim/app/api/credentials/[id]/route.test.ts b/apps/sim/app/api/credentials/[id]/route.test.ts index b8bcd9b1639..b74a9c990c0 100644 --- a/apps/sim/app/api/credentials/[id]/route.test.ts +++ b/apps/sim/app/api/credentials/[id]/route.test.ts @@ -8,7 +8,7 @@ const mocks = vi.hoisted(() => ({ remove: vi.fn(), })) -vi.mock('@/lib/credentials/application/credential-crud', () => ({ +vi.mock('@/lib/credentials/application/crud', () => ({ CredentialProviderOperationError: class CredentialProviderOperationError extends Error {}, getWorkspaceCredentialUseCase: { operation: { id: 'credentials.read' }, diff --git a/apps/sim/app/api/credentials/[id]/route.ts b/apps/sim/app/api/credentials/[id]/route.ts index e07c8f5f6bd..e840e0792ab 100644 --- a/apps/sim/app/api/credentials/[id]/route.ts +++ b/apps/sim/app/api/credentials/[id]/route.ts @@ -16,7 +16,7 @@ import { import { getWorkspaceCredentialUseCase, updateWorkspaceCredentialUseCase, -} from '@/lib/credentials/application/credential-crud' +} from '@/lib/credentials/application/crud' import { credentialOperations } from '@/lib/credentials/application/operations' import { toWorkspaceCredential } from '@/lib/credentials/application/presentation' import { deleteCredentialUseCase } from '@/lib/credentials/application/service-account' diff --git a/apps/sim/app/api/credentials/memberships/route.ts b/apps/sim/app/api/credentials/memberships/route.ts index 6ee05aa1de6..3bc4ee68edd 100644 --- a/apps/sim/app/api/credentials/memberships/route.ts +++ b/apps/sim/app/api/credentials/memberships/route.ts @@ -14,7 +14,7 @@ import { import { leaveCredentialMembershipUseCase, listCredentialMembershipsUseCase, -} from '@/lib/credentials/application/credential-members' +} from '@/lib/credentials/application/members' import { credentialUserOperations } from '@/lib/credentials/application/operations' const rateLimit = internalRateLimits.none({ reason: 'Preserve existing internal behavior' }) diff --git a/apps/sim/app/api/credentials/route.test.ts b/apps/sim/app/api/credentials/route.test.ts index d9f696b45ec..2491d6af8c0 100644 --- a/apps/sim/app/api/credentials/route.test.ts +++ b/apps/sim/app/api/credentials/route.test.ts @@ -56,7 +56,7 @@ vi.mock('@/lib/integrations/credential-visibility.server', () => ({ vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/app/api/credentials/route.ts b/apps/sim/app/api/credentials/route.ts index ea3203d398f..6951107c48e 100644 --- a/apps/sim/app/api/credentials/route.ts +++ b/apps/sim/app/api/credentials/route.ts @@ -14,7 +14,7 @@ import { import { createWorkspaceCredential, listInternalCredentials, -} from '@/lib/credentials/application/credential-crud' +} from '@/lib/credentials/application/crud' import { credentialOperations } from '@/lib/credentials/application/operations' import { toWorkspaceCredential } from '@/lib/credentials/application/presentation' diff --git a/apps/sim/app/api/custom-blocks/[id]/usages/route.test.ts b/apps/sim/app/api/custom-blocks/[id]/usages/route.test.ts index 3b7157fb4ac..3ed27defe51 100644 --- a/apps/sim/app/api/custom-blocks/[id]/usages/route.test.ts +++ b/apps/sim/app/api/custom-blocks/[id]/usages/route.test.ts @@ -11,7 +11,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { OrchestrationError } from '@/lib/core/orchestration/types' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/custom-blocks/operations', () => customBlockOperationsMock) diff --git a/apps/sim/app/api/files/authorization.test.ts b/apps/sim/app/api/files/authorization.test.ts index 9d601a564f3..b25b679b1be 100644 --- a/apps/sim/app/api/files/authorization.test.ts +++ b/apps/sim/app/api/files/authorization.test.ts @@ -29,7 +29,7 @@ const { mockFindWorkspaceFileVersionKeys } = vi.hoisted(() => ({ mockFindWorkspaceFileVersionKeys: vi.fn(), })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-versions', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-version-store', () => ({ findWorkspaceFileVersionKeys: mockFindWorkspaceFileVersionKeys, })) @@ -39,7 +39,7 @@ vi.mock('@/lib/uploads/config', () => uploadsConfigMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) diff --git a/apps/sim/app/api/files/authorization.ts b/apps/sim/app/api/files/authorization.ts index 213c8fdf168..41234edc614 100644 --- a/apps/sim/app/api/files/authorization.ts +++ b/apps/sim/app/api/files/authorization.ts @@ -13,11 +13,11 @@ import { import { type KnowledgeReadAccess, knowledgeReadAccessBatches } from '@/lib/knowledge/read-access' import { getFileMetadata } from '@/lib/uploads' import type { StorageContext } from '@/lib/uploads/config' -import { findWorkspaceFileVersionKeys } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { findWorkspaceFileVersionKeys } from '@/lib/uploads/contexts/workspace/file-version-store' import type { StorageConfig } from '@/lib/uploads/core/storage-client' import { getFileMetadataByKey } from '@/lib/uploads/server/metadata' import { isWorkspaceScopedContext } from '@/lib/uploads/shared/types' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils' const logger = createLogger('FileAuthorization') diff --git a/apps/sim/app/api/files/delete/route.ts b/apps/sim/app/api/files/delete/route.ts index 59ad6ef1ce5..72ae7640c8c 100644 --- a/apps/sim/app/api/files/delete/route.ts +++ b/apps/sim/app/api/files/delete/route.ts @@ -8,7 +8,7 @@ import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import type { StorageContext } from '@/lib/uploads/config' import { deleteFile } from '@/lib/uploads/core/storage-service' import { deleteFileMetadata } from '@/lib/uploads/server/metadata' -import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file' import { verifyFileAccess, verifyKBFileWriteAccess } from '@/app/api/files/authorization' import { createFileErrorResponse, diff --git a/apps/sim/app/api/files/export/[id]/route.ts b/apps/sim/app/api/files/export/[id]/route.ts index 9ec91812e13..eb27d10003f 100644 --- a/apps/sim/app/api/files/export/[id]/route.ts +++ b/apps/sim/app/api/files/export/[id]/route.ts @@ -25,7 +25,7 @@ import { import { getFileMetadataById } from '@/lib/uploads/server/metadata' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' import { storedFileId } from '@/lib/uploads/utils/embedded-image-ref' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' import { verifyFileAccess } from '@/app/api/files/authorization' import { encodeFilenameForHeader } from '@/app/api/files/utils' diff --git a/apps/sim/app/api/files/public/[token]/content/route.test.ts b/apps/sim/app/api/files/public/[token]/content/route.test.ts index c80e4688efe..7ec6892222c 100644 --- a/apps/sim/app/api/files/public/[token]/content/route.test.ts +++ b/apps/sim/app/api/files/public/[token]/content/route.test.ts @@ -14,7 +14,7 @@ const { mockEnforceRateLimit, mockValidateDeploymentAuth, mockResolveServableDoc }) ) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/public-shares/rate-limit', () => ({ enforcePublicFileRateLimit: mockEnforceRateLimit, diff --git a/apps/sim/app/api/files/public/[token]/content/route.ts b/apps/sim/app/api/files/public/[token]/content/route.ts index 389b440b906..70c289dbd86 100644 --- a/apps/sim/app/api/files/public/[token]/content/route.ts +++ b/apps/sim/app/api/files/public/[token]/content/route.ts @@ -8,8 +8,8 @@ import { validateDeploymentAuth } from '@/lib/core/security/deployment-auth' import { generateRequestId } from '@/lib/core/utils/request' import { assertKnownSizeWithinLimit } from '@/lib/core/utils/stream-limits' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' import { enforcePublicFileRateLimit } from '@/lib/public-shares/rate-limit' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' import { downloadFile } from '@/lib/uploads/core/storage-service' import { resolveServableDoc } from '@/lib/uploads/documents/compile' import { resolveServableImageBytes } from '@/lib/uploads/server/image-derivative' diff --git a/apps/sim/app/api/files/public/[token]/inline/route.test.ts b/apps/sim/app/api/files/public/[token]/inline/route.test.ts index 33bbace8cd1..bbdc860e5c8 100644 --- a/apps/sim/app/api/files/public/[token]/inline/route.test.ts +++ b/apps/sim/app/api/files/public/[token]/inline/route.test.ts @@ -13,7 +13,7 @@ const { mockRateLimit, mockValidateAuth, mockResolveImage } = vi.hoisted(() => ( mockResolveImage: vi.fn(), })) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/public-shares/rate-limit', () => ({ enforcePublicFileRateLimit: mockRateLimit })) vi.mock('@/lib/core/security/deployment-auth', () => ({ validateDeploymentAuth: mockValidateAuth })) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) diff --git a/apps/sim/app/api/files/public/[token]/inline/route.ts b/apps/sim/app/api/files/public/[token]/inline/route.ts index e97732ba67b..f72547accc1 100644 --- a/apps/sim/app/api/files/public/[token]/inline/route.ts +++ b/apps/sim/app/api/files/public/[token]/inline/route.ts @@ -8,8 +8,8 @@ import { validateDeploymentAuth } from '@/lib/core/security/deployment-auth' import { generateRequestId } from '@/lib/core/utils/request' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' import { enforcePublicFileRateLimit } from '@/lib/public-shares/rate-limit' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' import { downloadFile } from '@/lib/uploads/core/storage-service' import { hasEmbeddedFileRef } from '@/lib/uploads/server/embedded-image-refs' import { resolveWorkspaceInlineImage } from '@/lib/uploads/server/inline-image' diff --git a/apps/sim/app/api/files/public/[token]/otp/route.test.ts b/apps/sim/app/api/files/public/[token]/otp/route.test.ts index ee33611b9f6..77a8c162acd 100644 --- a/apps/sim/app/api/files/public/[token]/otp/route.test.ts +++ b/apps/sim/app/api/files/public/[token]/otp/route.test.ts @@ -29,7 +29,7 @@ const { mockAfterResponse: vi.fn(), })) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/core/security/deployment', () => ({ isEmailAllowed: mockIsEmailAllowed, setDeploymentAuthCookie: mockSetDeploymentAuthCookie, diff --git a/apps/sim/app/api/files/public/[token]/otp/route.ts b/apps/sim/app/api/files/public/[token]/otp/route.ts index 57a707c189b..87dec5ec3e0 100644 --- a/apps/sim/app/api/files/public/[token]/otp/route.ts +++ b/apps/sim/app/api/files/public/[token]/otp/route.ts @@ -26,7 +26,7 @@ import { afterResponse } from '@/lib/core/utils/after-response' import { generateRequestId, getClientIp } from '@/lib/core/utils/request' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import { sendEmail } from '@/lib/messaging/email/mailer' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' export const dynamic = 'force-dynamic' diff --git a/apps/sim/app/api/files/public/[token]/route.test.ts b/apps/sim/app/api/files/public/[token]/route.test.ts index 2a996f664d4..bace6e2f8fb 100644 --- a/apps/sim/app/api/files/public/[token]/route.test.ts +++ b/apps/sim/app/api/files/public/[token]/route.test.ts @@ -9,7 +9,7 @@ const { mockEnforceRateLimit, mockValidateDeploymentAuth, mockSetDeploymentAuthC mockSetDeploymentAuthCookie: vi.fn(), })) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/public-shares/rate-limit', () => ({ enforcePublicFileRateLimit: mockEnforceRateLimit, diff --git a/apps/sim/app/api/files/public/[token]/route.ts b/apps/sim/app/api/files/public/[token]/route.ts index 5874d977b9b..68493446c05 100644 --- a/apps/sim/app/api/files/public/[token]/route.ts +++ b/apps/sim/app/api/files/public/[token]/route.ts @@ -11,8 +11,8 @@ import { setDeploymentAuthCookie } from '@/lib/core/security/deployment' import { validateDeploymentAuth } from '@/lib/core/security/deployment-auth' import { generateRequestId } from '@/lib/core/utils/request' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' import { enforcePublicFileRateLimit } from '@/lib/public-shares/rate-limit' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' export const dynamic = 'force-dynamic' diff --git a/apps/sim/app/api/files/public/[token]/sso/route.test.ts b/apps/sim/app/api/files/public/[token]/sso/route.test.ts index 20957fa6465..1cbbc38749c 100644 --- a/apps/sim/app/api/files/public/[token]/sso/route.test.ts +++ b/apps/sim/app/api/files/public/[token]/sso/route.test.ts @@ -9,7 +9,7 @@ const { mockIsEmailAllowed } = vi.hoisted(() => ({ mockIsEmailAllowed: vi.fn(), })) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/core/security/deployment', () => ({ isEmailAllowed: mockIsEmailAllowed })) vi.mock('@/lib/core/rate-limiter', () => rateLimiterMock) diff --git a/apps/sim/app/api/files/public/[token]/sso/route.ts b/apps/sim/app/api/files/public/[token]/sso/route.ts index bc94fdcd0b6..2ab675b5af8 100644 --- a/apps/sim/app/api/files/public/[token]/sso/route.ts +++ b/apps/sim/app/api/files/public/[token]/sso/route.ts @@ -9,7 +9,7 @@ import { RateLimiter } from '@/lib/core/rate-limiter' import { isEmailAllowed } from '@/lib/core/security/deployment' import { generateRequestId, getClientIp } from '@/lib/core/utils/request' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' export const dynamic = 'force-dynamic' export const runtime = 'nodejs' diff --git a/apps/sim/app/api/files/serve/[...path]/route.test.ts b/apps/sim/app/api/files/serve/[...path]/route.test.ts index 1cd21e7cba2..447460a1b8e 100644 --- a/apps/sim/app/api/files/serve/[...path]/route.test.ts +++ b/apps/sim/app/api/files/serve/[...path]/route.test.ts @@ -84,7 +84,7 @@ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) @@ -98,7 +98,7 @@ vi.mock('@/lib/execution/sandbox/run-task', () => ({ ), })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspace-files/api', () => ({ internalWorkspaceFileServeAuth: { authenticate: mockAuthenticateWorkspaceFile }, diff --git a/apps/sim/app/api/files/serve/[...path]/route.ts b/apps/sim/app/api/files/serve/[...path]/route.ts index 65c99bec61c..fb06b9262a1 100644 --- a/apps/sim/app/api/files/serve/[...path]/route.ts +++ b/apps/sim/app/api/files/serve/[...path]/route.ts @@ -16,14 +16,14 @@ import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import { CopilotFiles, isUsingCloudStorage } from '@/lib/uploads' import type { StorageContext } from '@/lib/uploads/config' import { readOrganizationChatAttachment } from '@/lib/uploads/contexts/organization-assistant/application' -import { parseWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { parseWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/file-manager' import { downloadFile } from '@/lib/uploads/core/storage-service' import { resolveServableDocBytes } from '@/lib/uploads/documents/compile' import { DocCompileUserError } from '@/lib/uploads/documents/compile-error' import { resolveServableImageBytes } from '@/lib/uploads/server/image-derivative' import { resolveStoredFileContext } from '@/lib/uploads/server/metadata' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import { internalWorkspaceFileServeAuth } from '@/lib/workspace-files/api' import { readWorkspaceFileContentByKey } from '@/lib/workspace-files/application/read-workspace-file-content-by-key' import { isSimPageSource, SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' diff --git a/apps/sim/app/api/files/uploads/purposes.ts b/apps/sim/app/api/files/uploads/purposes.ts index a438007ef4c..9273ad4fc59 100644 --- a/apps/sim/app/api/files/uploads/purposes.ts +++ b/apps/sim/app/api/files/uploads/purposes.ts @@ -12,7 +12,7 @@ import { UploadSessionError, type UploadSessionRecord, } from '@/lib/uploads/upload-session/service' -import { isImageFileType } from '@/lib/uploads/utils/file-utils' +import { isImageFileType } from '@/lib/uploads/utils/file' import { validateAttachmentFileType } from '@/lib/uploads/utils/validation' import { authorizeWorkspaceFileAccess, diff --git a/apps/sim/app/api/files/utils.ts b/apps/sim/app/api/files/utils.ts index fd98dee1fe2..b668142b9e9 100644 --- a/apps/sim/app/api/files/utils.ts +++ b/apps/sim/app/api/files/utils.ts @@ -5,7 +5,7 @@ import { isPayloadSizeLimitError, readNodeStreamToBufferWithLimit, } from '@/lib/core/utils/stream-limits' -import { ensureFileNameExtension, sanitizeFileKey } from '@/lib/uploads/utils/file-utils' +import { ensureFileNameExtension, sanitizeFileKey } from '@/lib/uploads/utils/file' const logger = createLogger('FilesUtils') diff --git a/apps/sim/app/api/knowledge/connectors/member-sync/route.test.ts b/apps/sim/app/api/knowledge/connectors/member-sync/route.test.ts index edd60e20362..741965b86ae 100644 --- a/apps/sim/app/api/knowledge/connectors/member-sync/route.test.ts +++ b/apps/sim/app/api/knowledge/connectors/member-sync/route.test.ts @@ -21,7 +21,7 @@ const mocks = vi.hoisted(() => ({ sweep: vi.fn(), })) vi.mock('@/lib/auth/internal', () => authInternalMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/connectors/member-queue', () => knowledgeMemberQueueMock) vi.mock('@/lib/knowledge/connectors/member-observations', () => ({ sweepStaleMemberObservations: mocks.sweep, diff --git a/apps/sim/app/api/knowledge/connectors/member-sync/route.ts b/apps/sim/app/api/knowledge/connectors/member-sync/route.ts index a05b3b847ef..d7af3b8abc0 100644 --- a/apps/sim/app/api/knowledge/connectors/member-sync/route.ts +++ b/apps/sim/app/api/knowledge/connectors/member-sync/route.ts @@ -8,7 +8,7 @@ import { verifyCronAuth } from '@/lib/auth/internal' import { resolveSystemBillingAttribution, resolveSystemOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { resourceScopeFromOwner } from '@/lib/core/resource-scope' import { mapWithConcurrency } from '@/lib/core/utils/concurrency' import { generateRequestId } from '@/lib/core/utils/request' diff --git a/apps/sim/app/api/knowledge/connectors/sync/route.test.ts b/apps/sim/app/api/knowledge/connectors/sync/route.test.ts index 765e985c2c8..de75288eb28 100644 --- a/apps/sim/app/api/knowledge/connectors/sync/route.test.ts +++ b/apps/sim/app/api/knowledge/connectors/sync/route.test.ts @@ -36,7 +36,7 @@ const { mockDispatchSync } = vi.hoisted(() => ({ vi.mock('@/lib/auth/internal', () => authInternalMock) vi.mock('@/lib/knowledge/connectors/queue', () => ({ dispatchSync: mockDispatchSync })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { GET } from '@/app/api/knowledge/connectors/sync/route' diff --git a/apps/sim/app/api/knowledge/connectors/sync/route.ts b/apps/sim/app/api/knowledge/connectors/sync/route.ts index a00b3596b71..f0a2f8d4513 100644 --- a/apps/sim/app/api/knowledge/connectors/sync/route.ts +++ b/apps/sim/app/api/knowledge/connectors/sync/route.ts @@ -7,7 +7,7 @@ import { verifyCronAuth } from '@/lib/auth/internal' import { resolveSystemBillingAttribution, resolveSystemOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { resourceScopeFromOwner } from '@/lib/core/resource-scope' import { mapWithConcurrency } from '@/lib/core/utils/concurrency' import { generateRequestId } from '@/lib/core/utils/request' diff --git a/apps/sim/app/api/knowledge/utils.test.ts b/apps/sim/app/api/knowledge/utils.test.ts index 9c7f968a0ba..9ddb97fce41 100644 --- a/apps/sim/app/api/knowledge/utils.test.ts +++ b/apps/sim/app/api/knowledge/utils.test.ts @@ -12,7 +12,7 @@ import { schemaMock, } from '@sim/testing' import { afterAll, beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest' -import * as billingAttributionModule from '@/lib/billing/core/billing-attribution' +import * as billingAttributionModule from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import * as documentsUtilsModule from '@/lib/knowledge/documents/utils' import * as workspacesUtilsModule from '@/lib/workspaces/utils' @@ -94,7 +94,7 @@ function applyBillingSpies() { */ applyBillingSpies() -vi.mock('@/lib/knowledge/documents/document-processor', () => ({ +vi.mock('@/lib/knowledge/documents/processor', () => ({ processDocument: vi.fn().mockResolvedValue({ chunks: [ { diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts index 2fd792c57ed..91a4b7c36aa 100644 --- a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts +++ b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts @@ -38,7 +38,7 @@ const { vi.mock('@/lib/core/security/encryption', () => encryptionMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) const { mockAssertBillingAttributionSnapshot, diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.ts index 5a736c11339..a6ae1898e2b 100644 --- a/apps/sim/app/api/mcp/serve/[serverId]/route.ts +++ b/apps/sim/app/api/mcp/serve/[serverId]/route.ts @@ -55,7 +55,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { getMaxExecutionTimeout } from '@/lib/core/execution-limits' import { acceptsMediaType } from '@/lib/core/utils/media-types' import { generateRequestId } from '@/lib/core/utils/request' diff --git a/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts b/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts index e8d83a8fe08..58abf60d17c 100644 --- a/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts +++ b/apps/sim/app/api/mothership/chats/[chatId]/fork/route.test.ts @@ -58,7 +58,7 @@ const { vi.mock('@/lib/mothership/request/http', () => copilotHttpMock) vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) diff --git a/apps/sim/app/api/mothership/chats/[chatId]/restore/route.test.ts b/apps/sim/app/api/mothership/chats/[chatId]/restore/route.test.ts index 889b8e4babf..d5c0dbaaff3 100644 --- a/apps/sim/app/api/mothership/chats/[chatId]/restore/route.test.ts +++ b/apps/sim/app/api/mothership/chats/[chatId]/restore/route.test.ts @@ -24,7 +24,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) vi.mock('@/lib/core/application/organization-authorization', () => organizationAuthorizationMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/mothership/chat-status', () => mothershipChatStatusMock) vi.mock('@/lib/posthog/server', () => posthogServerMock) diff --git a/apps/sim/app/api/mothership/chats/route.test.ts b/apps/sim/app/api/mothership/chats/route.test.ts index dea0369975f..7184ad26a6f 100644 --- a/apps/sim/app/api/mothership/chats/route.test.ts +++ b/apps/sim/app/api/mothership/chats/route.test.ts @@ -21,7 +21,7 @@ const { mockReconcileChatStreamMarkers } = vi.hoisted(() => ({ vi.mock('@/lib/mothership/request/http', () => copilotHttpMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) vi.mock('@/lib/mothership/chat/stream-liveness', () => ({ diff --git a/apps/sim/app/api/mothership/execute/route.test.ts b/apps/sim/app/api/mothership/execute/route.test.ts index 26483dbe509..8f691810e30 100644 --- a/apps/sim/app/api/mothership/execute/route.test.ts +++ b/apps/sim/app/api/mothership/execute/route.test.ts @@ -41,7 +41,7 @@ vi.mock('@/lib/internal/principals/executor', () => executorPrincipalMock) vi.mock('@/lib/core/security/encryption', () => encryptionMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/chat/payload', () => mothershipChatPayloadMock) diff --git a/apps/sim/app/api/mothership/execute/route.ts b/apps/sim/app/api/mothership/execute/route.ts index 6e908371cb4..a48442f1941 100644 --- a/apps/sim/app/api/mothership/execute/route.ts +++ b/apps/sim/app/api/mothership/execute/route.ts @@ -10,7 +10,7 @@ import { import { parseRequest } from '@/lib/api/server' import { checkInternalAuth } from '@/lib/auth/hybrid' import { verifyInternalDelegationToken } from '@/lib/auth/internal' -import { requireBillingAttributionHeader } from '@/lib/billing/core/billing-attribution' +import { requireBillingAttributionHeader } from '@/lib/billing/core/attribution' import { acceptsMediaType } from '@/lib/core/utils/media-types' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils' diff --git a/apps/sim/app/api/mothership/integrations/catalog/route.test.ts b/apps/sim/app/api/mothership/integrations/catalog/route.test.ts index a41e08247bf..74a14af3d34 100644 --- a/apps/sim/app/api/mothership/integrations/catalog/route.test.ts +++ b/apps/sim/app/api/mothership/integrations/catalog/route.test.ts @@ -16,7 +16,7 @@ vi.unmock('@/lib/mothership/request/http') vi.mock('@/lib/mothership/chat/payload', () => mothershipChatPayloadMock) vi.mock('@/lib/mothership/mcp-tools', () => ({ buildTaggedMcpToolSchemas: vi.fn() })) vi.mock('@/lib/mcp/application/use-cases', () => mcpUseCasesMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock( '@/lib/mothership/chat/application/workspace-context', diff --git a/apps/sim/app/api/mothership/runs/control/route.test.ts b/apps/sim/app/api/mothership/runs/control/route.test.ts index 60c09b93d9a..b6d5151ce9d 100644 --- a/apps/sim/app/api/mothership/runs/control/route.test.ts +++ b/apps/sim/app/api/mothership/runs/control/route.test.ts @@ -18,7 +18,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.unmock('@/lib/mothership/request/http') vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) vi.mock('@/lib/mothership/async-runs/repository', () => mothershipAsyncRunsMock) diff --git a/apps/sim/app/api/organizations/[id]/sso-policy/route.ts b/apps/sim/app/api/organizations/[id]/sso-policy/route.ts index e4b9c9da77c..0da15586320 100644 --- a/apps/sim/app/api/organizations/[id]/sso-policy/route.ts +++ b/apps/sim/app/api/organizations/[id]/sso-policy/route.ts @@ -13,7 +13,7 @@ import { readSsoRequirement, type SsoRequirement, setSsoRequirement, -} from '@/lib/auth/sso/application/sso-requirement' +} from '@/lib/auth/sso/application/requirement' const present = (requirement: SsoRequirement) => ({ success: true as const, data: requirement }) diff --git a/apps/sim/app/api/permission-groups/user/route.test.ts b/apps/sim/app/api/permission-groups/user/route.test.ts index f52b6baf5d3..c64e423bdb6 100644 --- a/apps/sim/app/api/permission-groups/user/route.test.ts +++ b/apps/sim/app/api/permission-groups/user/route.test.ts @@ -19,7 +19,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' const mocks = vi.hoisted(() => ({ group: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) diff --git a/apps/sim/app/api/resume/poll/route.test.ts b/apps/sim/app/api/resume/poll/route.test.ts index a26c49bd798..9fc08fdd637 100644 --- a/apps/sim/app/api/resume/poll/route.test.ts +++ b/apps/sim/app/api/resume/poll/route.test.ts @@ -36,7 +36,7 @@ const preprocessExecutionMock = executionPreprocessingMockFns.mockPreprocessExec vi.mock('@/lib/auth/internal', () => authInternalMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/execution/preprocessing', () => executionPreprocessingMock) diff --git a/apps/sim/app/api/schedules/execute/route.test.ts b/apps/sim/app/api/schedules/execute/route.test.ts index ec145236695..42ea201b764 100644 --- a/apps/sim/app/api/schedules/execute/route.test.ts +++ b/apps/sim/app/api/schedules/execute/route.test.ts @@ -87,7 +87,7 @@ const { vi.mock('@/lib/auth/internal', () => authInternalMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/background/schedule-execution', () => ({ executeScheduleJob: mockExecuteScheduleJob, diff --git a/apps/sim/app/api/schedules/execute/route.ts b/apps/sim/app/api/schedules/execute/route.ts index 8e001717d37..2f5dc05244f 100644 --- a/apps/sim/app/api/schedules/execute/route.ts +++ b/apps/sim/app/api/schedules/execute/route.ts @@ -22,7 +22,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, resolveSystemBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { getJobQueue, JOB_PENDING_RETENTION_HOURS, diff --git a/apps/sim/app/api/speech/token/route.test.ts b/apps/sim/app/api/speech/token/route.test.ts index 976f8b80991..2b82139fbba 100644 --- a/apps/sim/app/api/speech/token/route.test.ts +++ b/apps/sim/app/api/speech/token/route.test.ts @@ -38,13 +38,13 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@/lib/billing/core/usage-log', () => billingUsageLogMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/threshold-billing', () => ({ checkAndBillPayerOverageThreshold: hoisted.billOverage, })) vi.mock('@/lib/core/rate-limiter', () => rateLimiterMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { OrchestrationError } from '@/lib/core/orchestration/types' import { createSpeechToken } from '@/lib/speech/application/create-token' diff --git a/apps/sim/app/api/v1/files/route.ts b/apps/sim/app/api/v1/files/route.ts index 8d8b8659753..249694ef5b3 100644 --- a/apps/sim/app/api/v1/files/route.ts +++ b/apps/sim/app/api/v1/files/route.ts @@ -19,7 +19,7 @@ import { listWorkspaceFiles, uploadWorkspaceFile, } from '@/lib/uploads/contexts/workspace' -import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { checkRateLimit, checkWorkspaceScope, diff --git a/apps/sim/app/api/v1/knowledge/[id]/documents/route.test.ts b/apps/sim/app/api/v1/knowledge/[id]/documents/route.test.ts index 9ba5eaf040b..71d2fabf474 100644 --- a/apps/sim/app/api/v1/knowledge/[id]/documents/route.test.ts +++ b/apps/sim/app/api/v1/knowledge/[id]/documents/route.test.ts @@ -55,7 +55,7 @@ vi.mock('@/app/api/v1/knowledge/utils', () => ({ vi.mock('@/lib/billing/calculations/usage-monitor', () => billingUsageMonitorMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) diff --git a/apps/sim/app/api/v1/knowledge/[id]/documents/route.ts b/apps/sim/app/api/v1/knowledge/[id]/documents/route.ts index 8ee583d3640..74580b77d56 100644 --- a/apps/sim/app/api/v1/knowledge/[id]/documents/route.ts +++ b/apps/sim/app/api/v1/knowledge/[id]/documents/route.ts @@ -8,7 +8,7 @@ import { checkAttributedUsageLimits, resolveBillingAttribution, resolveSystemBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { messageForOrchestrationError, statusForOrchestrationError, @@ -24,7 +24,7 @@ import { getDocuments } from '@/lib/knowledge/documents/service' import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types' import { performUploadKnowledgeDocument } from '@/lib/knowledge/orchestration' import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace' -import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { validateFileType } from '@/lib/uploads/utils/validation' import { handleError, diff --git a/apps/sim/app/api/v1/knowledge/search/route.test.ts b/apps/sim/app/api/v1/knowledge/search/route.test.ts index f840dee88ab..11eb1b1df66 100644 --- a/apps/sim/app/api/v1/knowledge/search/route.test.ts +++ b/apps/sim/app/api/v1/knowledge/search/route.test.ts @@ -68,7 +68,7 @@ vi.mock('@/app/api/knowledge/utils', () => knowledgeApiUtilsMock) vi.mock('@/lib/billing/calculations/usage-monitor', () => billingUsageMonitorMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) vi.mock('@/lib/knowledge/embeddings', () => knowledgeEmbeddingsMock) diff --git a/apps/sim/app/api/v1/knowledge/search/route.ts b/apps/sim/app/api/v1/knowledge/search/route.ts index 91c1a56a91c..fd239a218e0 100644 --- a/apps/sim/app/api/v1/knowledge/search/route.ts +++ b/apps/sim/app/api/v1/knowledge/search/route.ts @@ -4,7 +4,7 @@ import { parseRequest } from '@/lib/api/server' import { resolveBillingAttribution, resolveSystemBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { checkSearchUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import { ALL_TAG_SLOTS } from '@/lib/knowledge/constants' diff --git a/apps/sim/app/api/v1/knowledge/utils.ts b/apps/sim/app/api/v1/knowledge/utils.ts index af317955115..4cf6e70777e 100644 --- a/apps/sim/app/api/v1/knowledge/utils.ts +++ b/apps/sim/app/api/v1/knowledge/utils.ts @@ -6,7 +6,7 @@ import { WORKSPACE_ACCESS_SCOPE, } from '@/lib/knowledge/access/scope' import type { KnowledgeAccessProvider, KnowledgeAccessScope } from '@/lib/knowledge/access/types' -import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/knowledge-base-reference' +import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/active-base-reference' import { getActiveKnowledgeBaseReference } from '@/lib/knowledge/service' import type { KnowledgeBaseWithCounts } from '@/lib/knowledge/types' import { diff --git a/apps/sim/app/api/v2/chat-deployments/route.test.ts b/apps/sim/app/api/v2/chat-deployments/route.test.ts index b3896922e5e..7c7086f72a4 100644 --- a/apps/sim/app/api/v2/chat-deployments/route.test.ts +++ b/apps/sim/app/api/v2/chat-deployments/route.test.ts @@ -37,7 +37,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@/lib/chat-deployments/queries', () => ({ listWorkspaceChatDeployments: mocks.listDeployments, diff --git a/apps/sim/app/api/v2/chat/route.test.ts b/apps/sim/app/api/v2/chat/route.test.ts index 81010d6800c..43407a8aa62 100644 --- a/apps/sim/app/api/v2/chat/route.test.ts +++ b/apps/sim/app/api/v2/chat/route.test.ts @@ -69,7 +69,7 @@ vi.mock('@sim/utils/id', () => idMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/environment-context', () => mothershipEnvironmentContextMock) diff --git a/apps/sim/app/api/v2/chat/route.ts b/apps/sim/app/api/v2/chat/route.ts index 29b9297ba93..c34498d5636 100644 --- a/apps/sim/app/api/v2/chat/route.ts +++ b/apps/sim/app/api/v2/chat/route.ts @@ -17,7 +17,7 @@ import { v2ApiKeyAuth, v2RateLimits, } from '@/lib/api/server/routes' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { ForbiddenOperationError, forbiddenErrorDetails, diff --git a/apps/sim/app/api/v2/credentials/[credentialId]/members/[userId]/route.ts b/apps/sim/app/api/v2/credentials/[credentialId]/members/[userId]/route.ts index 6cc9efea2f0..12c751816a7 100644 --- a/apps/sim/app/api/v2/credentials/[credentialId]/members/[userId]/route.ts +++ b/apps/sim/app/api/v2/credentials/[credentialId]/members/[userId]/route.ts @@ -5,7 +5,7 @@ import { v2ApiKeyAuth, v2RateLimits, } from '@/lib/api/server/routes' -import { removeCredentialMemberUseCase } from '@/lib/credentials/application/credential-members' +import { removeCredentialMemberUseCase } from '@/lib/credentials/application/members' import { credentialOperations } from '@/lib/credentials/application/operations' export const DELETE = defineV2JsonRoute({ diff --git a/apps/sim/app/api/v2/credentials/[credentialId]/members/route.ts b/apps/sim/app/api/v2/credentials/[credentialId]/members/route.ts index 6f4b4f5bb08..19d3211a318 100644 --- a/apps/sim/app/api/v2/credentials/[credentialId]/members/route.ts +++ b/apps/sim/app/api/v2/credentials/[credentialId]/members/route.ts @@ -12,7 +12,7 @@ import { import { listCredentialMembersUseCase, upsertCredentialMemberUseCase, -} from '@/lib/credentials/application/credential-members' +} from '@/lib/credentials/application/members' import { credentialOperations } from '@/lib/credentials/application/operations' import { readSortedCursor, writeSortedCursor } from '@/app/api/v2/lib/response' diff --git a/apps/sim/app/api/v2/credentials/[credentialId]/route.test.ts b/apps/sim/app/api/v2/credentials/[credentialId]/route.test.ts index eac94e9ec6b..b490aae5611 100644 --- a/apps/sim/app/api/v2/credentials/[credentialId]/route.test.ts +++ b/apps/sim/app/api/v2/credentials/[credentialId]/route.test.ts @@ -22,10 +22,10 @@ vi.mock('@/lib/credentials/application/service-account', () => ({ }, })) -import { CredentialProviderOperationError } from '@/lib/credentials/application/credential-crud' +import { CredentialProviderOperationError } from '@/lib/credentials/application/crud' import { PATCH } from '@/app/api/v2/credentials/[credentialId]/route' -vi.mock('@/lib/credentials/application/credential-crud', async () => { +vi.mock('@/lib/credentials/application/crud', async () => { const { OrchestrationError: BaseError } = await import('@/lib/core/orchestration/types') class MockCredentialProviderOperationError extends BaseError { constructor( diff --git a/apps/sim/app/api/v2/credentials/[credentialId]/route.ts b/apps/sim/app/api/v2/credentials/[credentialId]/route.ts index b0b6a05895e..aa0d7c2eb97 100644 --- a/apps/sim/app/api/v2/credentials/[credentialId]/route.ts +++ b/apps/sim/app/api/v2/credentials/[credentialId]/route.ts @@ -11,7 +11,7 @@ import { import { CredentialProviderOperationError, updateWorkspaceCredentialUseCase, -} from '@/lib/credentials/application/credential-crud' +} from '@/lib/credentials/application/crud' import { credentialOperations } from '@/lib/credentials/application/operations' import { toV2Credential } from '@/lib/credentials/application/presentation' import { deleteCredentialUseCase } from '@/lib/credentials/application/service-account' diff --git a/apps/sim/app/api/v2/files/[fileId]/text/route.test.ts b/apps/sim/app/api/v2/files/[fileId]/text/route.test.ts index 4f5f9aceafb..796025d11ea 100644 --- a/apps/sim/app/api/v2/files/[fileId]/text/route.test.ts +++ b/apps/sim/app/api/v2/files/[fileId]/text/route.test.ts @@ -23,7 +23,7 @@ vi.mock('@/lib/api/server/routes/v2-api-key-auth', () => v2ApiKeyAuthModuleMock) vi.mock('@/lib/core/rate-limiter', () => v2RateLimiterModuleMock) import { NoWorkspaceAccessError } from '@/lib/core/application' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { GET } from '@/app/api/v2/files/[fileId]/text/route' const WORKSPACE_ID = '6fc7631d-88cd-46f8-9f0a-d4764daef7f8' diff --git a/apps/sim/app/api/v2/files/folders/restore/route.ts b/apps/sim/app/api/v2/files/folders/restore/route.ts index 9ab8b08f841..640fe96c15c 100644 --- a/apps/sim/app/api/v2/files/folders/restore/route.ts +++ b/apps/sim/app/api/v2/files/folders/restore/route.ts @@ -1,8 +1,8 @@ import { v2RestoreFileFolderContract } from '@/lib/api/contracts/v2/files' import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes' import { v2FileErrorPolicies } from '@/lib/workspace-files/api' +import { restoreWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/folders' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { restoreWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/workspace-file-folders' import { toWorkspaceFileFolderPathView } from '@/lib/workspace-files/folder-display-path' export const dynamic = 'force-dynamic' export const revalidate = 0 diff --git a/apps/sim/app/api/v2/files/folders/route.test.ts b/apps/sim/app/api/v2/files/folders/route.test.ts index f5e45618e10..7dfe174ddca 100644 --- a/apps/sim/app/api/v2/files/folders/route.test.ts +++ b/apps/sim/app/api/v2/files/folders/route.test.ts @@ -20,7 +20,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/api/server/routes/v2-api-key-auth', () => v2ApiKeyAuthModuleMock) vi.mock('@/lib/core/rate-limiter', () => v2RateLimiterModuleMock) vi.mock('@/lib/api/server/rate-limit-context', () => v1RateLimitContextModuleMock) -vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ +vi.mock('@/lib/workspace-files/application/folders', () => ({ listWorkspaceFileFoldersOperation: { operation: { id: 'files.folders.list', minimumRole: 'read', workspaceApiKey: 'allow' }, execute: mocks.listFolders, @@ -42,7 +42,7 @@ vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ import { WorkspaceFileFolderConflictError, WorkspaceFileItemsNotFoundError, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { GET, PATCH, POST } from '@/app/api/v2/files/folders/route' const WORKSPACE_ID = 'workspace-1' diff --git a/apps/sim/app/api/v2/files/folders/route.ts b/apps/sim/app/api/v2/files/folders/route.ts index 01cb0931afb..da99f1a01f9 100644 --- a/apps/sim/app/api/v2/files/folders/route.ts +++ b/apps/sim/app/api/v2/files/folders/route.ts @@ -6,13 +6,13 @@ import { } from '@/lib/api/contracts/v2/files' import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes' import { v2FileErrorPolicies } from '@/lib/workspace-files/api' -import { fileOperations } from '@/lib/workspace-files/application/operations' import { createWorkspaceFileFolderOperation, deleteWorkspaceFileFolderOperation, listWorkspaceFileFoldersOperation, updateWorkspaceFileFolderOperation, -} from '@/lib/workspace-files/application/workspace-file-folders' +} from '@/lib/workspace-files/application/folders' +import { fileOperations } from '@/lib/workspace-files/application/operations' import { toWorkspaceFileFolderPathView } from '@/lib/workspace-files/folder-display-path' export const dynamic = 'force-dynamic' export const revalidate = 0 diff --git a/apps/sim/app/api/v2/files/move/route.test.ts b/apps/sim/app/api/v2/files/move/route.test.ts index 1a40481e49d..af3952ff03a 100644 --- a/apps/sim/app/api/v2/files/move/route.test.ts +++ b/apps/sim/app/api/v2/files/move/route.test.ts @@ -24,7 +24,7 @@ vi.mock('@/lib/workspace-files/application/move-workspace-file-items', () => ({ }, })) -import { WorkspaceFileMoveConflictError } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { WorkspaceFileMoveConflictError } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { POST } from '@/app/api/v2/files/move/route' const WS = 'workspace-1' diff --git a/apps/sim/app/api/v2/files/route.ts b/apps/sim/app/api/v2/files/route.ts index 9a45a12f46f..ee6ff58ae45 100644 --- a/apps/sim/app/api/v2/files/route.ts +++ b/apps/sim/app/api/v2/files/route.ts @@ -6,7 +6,7 @@ import { } from '@/lib/api/contracts/v2/files' import { cursorRoute, cursorScopeKey } from '@/lib/api/cursor-binding' import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { v2FileErrorPolicies } from '@/lib/workspace-files/api' import { createWorkspaceFile } from '@/lib/workspace-files/application/create-workspace-file' import { workspaceFileRevisionField } from '@/lib/workspace-files/application/file-revision' diff --git a/apps/sim/app/api/v2/files/utils.test.ts b/apps/sim/app/api/v2/files/utils.test.ts index c4236e3ebb2..7a033620280 100644 --- a/apps/sim/app/api/v2/files/utils.test.ts +++ b/apps/sim/app/api/v2/files/utils.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' vi.mock('@/lib/users/queries', () => usersQueriesMock) -import type { WorkspaceFileVersionRecord } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import type { WorkspaceFileVersionRecord } from '@/lib/uploads/contexts/workspace/file-version-store' import { toV2FileVersions } from '@/app/api/v2/files/utils' const { mockFindUserEmailsByIds } = usersQueriesMockFns diff --git a/apps/sim/app/api/v2/files/utils.ts b/apps/sim/app/api/v2/files/utils.ts index b7956dccee2..bdeb3007f9f 100644 --- a/apps/sim/app/api/v2/files/utils.ts +++ b/apps/sim/app/api/v2/files/utils.ts @@ -4,8 +4,8 @@ import { getBaseUrl } from '@/lib/core/utils/urls' import { buildFolderPath } from '@/lib/folders/paths' import { workspaceResourceWebUrl } from '@/lib/resources' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileVersionRecord } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileVersionRecord } from '@/lib/uploads/contexts/workspace/file-version-store' import { findUserEmailsByIds, getUserEmailsByIds, diff --git a/apps/sim/app/api/v2/knowledge/search/route.application.test.ts b/apps/sim/app/api/v2/knowledge/search/route.application.test.ts index dbb95b9b67c..e65fe3637a9 100644 --- a/apps/sim/app/api/v2/knowledge/search/route.application.test.ts +++ b/apps/sim/app/api/v2/knowledge/search/route.application.test.ts @@ -47,7 +47,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) diff --git a/apps/sim/app/api/v2/organizations/[organizationId]/sso/policy/route.ts b/apps/sim/app/api/v2/organizations/[organizationId]/sso/policy/route.ts index 903fdfc2ce1..26556354f4d 100644 --- a/apps/sim/app/api/v2/organizations/[organizationId]/sso/policy/route.ts +++ b/apps/sim/app/api/v2/organizations/[organizationId]/sso/policy/route.ts @@ -2,7 +2,7 @@ import { v2GetSsoPolicyContract, v2UpdateSsoPolicyContract } from '@/lib/api/con import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes' import { v2SsoErrorPolicy } from '@/lib/api/server/routes/sso' import { ssoSettingsOperations } from '@/lib/auth/sso/application/operations' -import { readSsoRequirement, setSsoRequirement } from '@/lib/auth/sso/application/sso-requirement' +import { readSsoRequirement, setSsoRequirement } from '@/lib/auth/sso/application/requirement' export const GET = defineV2JsonRoute({ contract: v2GetSsoPolicyContract, diff --git a/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/route.test.ts b/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/route.test.ts index 73024c98985..b2bd3c9410e 100644 --- a/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/route.test.ts +++ b/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/route.test.ts @@ -29,7 +29,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/mcp/queries', async (importOriginal) => ({ ...(await importOriginal()), getWorkflowMcpServerById: mocks.getServer, diff --git a/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/tools/route.test.ts b/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/tools/route.test.ts index 5f818193138..a2a45a6fd77 100644 --- a/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/tools/route.test.ts +++ b/apps/sim/app/api/v2/workflow-mcp-servers/[serverId]/tools/route.test.ts @@ -31,7 +31,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/mcp/queries', async (importOriginal) => ({ ...(await importOriginal()), getWorkflowMcpServerById: mocks.getServer, diff --git a/apps/sim/app/api/v2/workflow-mcp-servers/route.test.ts b/apps/sim/app/api/v2/workflow-mcp-servers/route.test.ts index db1c2dcfb52..f35979b3194 100644 --- a/apps/sim/app/api/v2/workflow-mcp-servers/route.test.ts +++ b/apps/sim/app/api/v2/workflow-mcp-servers/route.test.ts @@ -29,7 +29,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/mcp/queries', async (importOriginal) => ({ ...(await importOriginal()), listWorkspaceWorkflowMcpServers: mocks.listServers, diff --git a/apps/sim/app/api/v2/workflows/[workflowId]/deployments/chat/route.test.ts b/apps/sim/app/api/v2/workflows/[workflowId]/deployments/chat/route.test.ts index eaa6cd084cd..e5ce031b2bf 100644 --- a/apps/sim/app/api/v2/workflows/[workflowId]/deployments/chat/route.test.ts +++ b/apps/sim/app/api/v2/workflows/[workflowId]/deployments/chat/route.test.ts @@ -44,7 +44,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@/lib/chat-deployments/queries', () => ({ listWorkspaceChatDeployments: vi.fn(), diff --git a/apps/sim/app/api/v2/workflows/[workflowId]/execute/route.ts b/apps/sim/app/api/v2/workflows/[workflowId]/execute/route.ts index b1a5a8e9c44..1251ccc2923 100644 --- a/apps/sim/app/api/v2/workflows/[workflowId]/execute/route.ts +++ b/apps/sim/app/api/v2/workflows/[workflowId]/execute/route.ts @@ -21,7 +21,7 @@ import { v2InvalidBodyResponse, v2RateLimits, } from '@/lib/api/server/routes' -import { getWorkspaceBilledAccountUserId } from '@/lib/billing/core/billing-attribution' +import { getWorkspaceBilledAccountUserId } from '@/lib/billing/core/attribution' import { tryAdmit } from '@/lib/core/admission/gate' import { ADMISSION_ERROR_DESCRIPTOR } from '@/lib/core/admission/transient-failure' import type { ForbiddenDetailCode } from '@/lib/core/application' diff --git a/apps/sim/app/api/v2/workflows/[workflowId]/operations/route.test.ts b/apps/sim/app/api/v2/workflows/[workflowId]/operations/route.test.ts index 2d4dbd23ac5..87fbe9a36dc 100644 --- a/apps/sim/app/api/v2/workflows/[workflowId]/operations/route.test.ts +++ b/apps/sim/app/api/v2/workflows/[workflowId]/operations/route.test.ts @@ -22,7 +22,7 @@ vi.mock('@/lib/api/server/routes/v2-api-key-auth', () => v2ApiKeyAuthModuleMock) vi.mock('@/lib/core/rate-limiter', () => v2RateLimiterModuleMock) import { NoWorkspaceAccessError } from '@/lib/core/application' -import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/workflow-operations-error' +import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/operations-error' import { POST } from '@/app/api/v2/workflows/[workflowId]/operations/route' const WORKFLOW_ID = 'workflow-1' diff --git a/apps/sim/app/api/v2/workflows/folders/route.ts b/apps/sim/app/api/v2/workflows/folders/route.ts index 11df1480e90..2493b923497 100644 --- a/apps/sim/app/api/v2/workflows/folders/route.ts +++ b/apps/sim/app/api/v2/workflows/folders/route.ts @@ -6,13 +6,13 @@ import { } from '@/lib/api/contracts/v2/workflows' import { defineV2JsonRoute, v2ApiKeyAuth, v2RateLimits } from '@/lib/api/server/routes' import { v2WorkflowErrorPolicies } from '@/lib/workflows/api' -import { workflowOperations } from '@/lib/workflows/application/operations' import { createWorkflowFolder, deleteWorkflowFolder, listWorkflowFolders, relocateWorkflowFolder, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' +import { workflowOperations } from '@/lib/workflows/application/operations' import { toV2PathFolder } from '@/app/api/v2/lib/folders' export const dynamic = 'force-dynamic' diff --git a/apps/sim/app/api/wand/route.ts b/apps/sim/app/api/wand/route.ts index 6d4c44f32a6..6d68c132c1b 100644 --- a/apps/sim/app/api/wand/route.ts +++ b/apps/sim/app/api/wand/route.ts @@ -13,7 +13,7 @@ import { checkAttributedUsageLimits, resolveBillingAttribution, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { recordUsage } from '@/lib/billing/core/usage-log' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { env } from '@/lib/core/config/env' diff --git a/apps/sim/app/api/webhooks/agentmail/thread-scope.integration.ts b/apps/sim/app/api/webhooks/agentmail/thread-scope.integration.ts index 4f7600e0f23..639eb7e93b0 100644 --- a/apps/sim/app/api/webhooks/agentmail/thread-scope.integration.ts +++ b/apps/sim/app/api/webhooks/agentmail/thread-scope.integration.ts @@ -27,7 +27,7 @@ const { mockExecuteInboxTask, mockSendInboxResponse } = vi.hoisted(() => ({ })) vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) vi.mock('@/lib/mothership/request/lifecycle/headless', () => mothershipHeadlessLifecycleMock) vi.mock('@/lib/mothership/request/lifecycle/start', () => ({ diff --git a/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts b/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts index 6334f836a28..a53b1a36cdd 100644 --- a/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts +++ b/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts @@ -24,7 +24,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/chat-deployments/queries', () => ({ getLiveChatDeploymentForWorkflow: hoisted.getLiveChatDeploymentForWorkflow, getChatDeploymentWithWorkspace: vi.fn(), diff --git a/apps/sim/app/api/workflows/[id]/execute/route.test.ts b/apps/sim/app/api/workflows/[id]/execute/route.test.ts index 2deaadc5b43..775fabceca5 100644 --- a/apps/sim/app/api/workflows/[id]/execute/route.test.ts +++ b/apps/sim/app/api/workflows/[id]/execute/route.test.ts @@ -52,7 +52,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' import type { AuthResult } from '@/lib/auth/hybrid' import { AsyncJobEnqueueError } from '@/lib/core/async-jobs/types' import { getRemainingExecutionMs } from '@/lib/core/execution-limits' -import { INTERNAL_EXECUTION_DEADLINE_HEADER } from '@/lib/execution/execution-deadline-header' +import { INTERNAL_EXECUTION_DEADLINE_HEADER } from '@/lib/execution/deadline-header' import { abortManualExecution, registerManualExecutionAborter, @@ -90,7 +90,7 @@ const { mockReleaseExecutionIdClaim: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/core/security/encryption', () => encryptionMock) diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts index 7a768159e64..c801059fcb8 100644 --- a/apps/sim/app/api/workflows/[id]/execute/route.ts +++ b/apps/sim/app/api/workflows/[id]/execute/route.ts @@ -24,7 +24,7 @@ import { type BillingAttributionSnapshot, getWorkspaceBilledAccountUserId, requireBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { admissionRejectedResponse, tryAdmit } from '@/lib/core/admission/gate' import { logFailureOnce } from '@/lib/core/errors/failure-log' import { @@ -50,6 +50,10 @@ import { SIM_VIA_HEADER, validateCallChain, } from '@/lib/execution/call-chain' +import { + INTERNAL_EXECUTION_DEADLINE_HEADER, + parseExecutionDeadlineHeader, +} from '@/lib/execution/deadline-header' import { createExecutionEventWriter, flushExecutionStreamReplayBuffer, @@ -58,10 +62,6 @@ import { setExecutionActiveBlockStarts, type TerminalExecutionStreamStatus, } from '@/lib/execution/event-buffer' -import { - INTERNAL_EXECUTION_DEADLINE_HEADER, - parseExecutionDeadlineHeader, -} from '@/lib/execution/execution-deadline-header' import { registerManualExecutionAborter, unregisterManualExecutionAborter, diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.test.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.test.ts index 6fe22318772..fec090ba11b 100644 --- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.test.ts +++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.test.ts @@ -19,7 +19,7 @@ vi.mock('@/lib/execution/event-buffer', () => ({ readExecutionMetaState: mockReadExecutionMetaState, })) -vi.mock('@/lib/execution/execution-signal', () => ({ +vi.mock('@/lib/execution/signal', () => ({ getExecutionSignalHub: () => ({ subscribe: mockSubscribe }), })) diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts index 29a4c3280a5..245588e60f1 100644 --- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts +++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts @@ -14,7 +14,7 @@ import { readExecutionEventsState, readExecutionMetaState, } from '@/lib/execution/event-buffer' -import { type ExecutionSignalReason, getExecutionSignalHub } from '@/lib/execution/execution-signal' +import { type ExecutionSignalReason, getExecutionSignalHub } from '@/lib/execution/signal' import { type ExecutionEvent, formatSSEEvent, diff --git a/apps/sim/app/api/workflows/[id]/log/route.test.ts b/apps/sim/app/api/workflows/[id]/log/route.test.ts index b78a0bb9b1d..4523b538298 100644 --- a/apps/sim/app/api/workflows/[id]/log/route.test.ts +++ b/apps/sim/app/api/workflows/[id]/log/route.test.ts @@ -22,7 +22,7 @@ vi.mock('@/app/api/workflows/middleware', () => ({ vi.mock('@/lib/workspaces/utils', () => workspacesUtilsMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/logs/execution/logging-session', () => loggingSessionMock) diff --git a/apps/sim/app/api/workflows/[id]/log/route.ts b/apps/sim/app/api/workflows/[id]/log/route.ts index fbf7f505427..1ce42a892ae 100644 --- a/apps/sim/app/api/workflows/[id]/log/route.ts +++ b/apps/sim/app/api/workflows/[id]/log/route.ts @@ -8,7 +8,7 @@ import { parseRequest } from '@/lib/api/server' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { generateRequestId } from '@/lib/core/utils/request' import { withRouteHandler } from '@/lib/core/utils/with-route-handler' import { LoggingSession } from '@/lib/logs/execution/logging-session' diff --git a/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.test.ts b/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.test.ts index 2baa813227a..e81c36af664 100644 --- a/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/api-keys/[keyId]/route.test.ts @@ -26,7 +26,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/posthog/server', () => posthogServerMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) import { capabilityRefusal } from '@/lib/permission-groups/capabilities' diff --git a/apps/sim/app/api/workspaces/[id]/api-keys/route.test.ts b/apps/sim/app/api/workspaces/[id]/api-keys/route.test.ts index 1e5cd8d2856..b4f988ef9b6 100644 --- a/apps/sim/app/api/workspaces/[id]/api-keys/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/api-keys/route.test.ts @@ -27,7 +27,7 @@ vi.mock('@/lib/api-key/orchestration', () => ({ vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) import { GET } from '@/app/api/workspaces/[id]/api-keys/route' diff --git a/apps/sim/app/api/workspaces/[id]/byok-keys/route.test.ts b/apps/sim/app/api/workspaces/[id]/byok-keys/route.test.ts index 06b92afac80..73bf67b3939 100644 --- a/apps/sim/app/api/workspaces/[id]/byok-keys/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/byok-keys/route.test.ts @@ -27,7 +27,7 @@ vi.mock('@/lib/posthog/server', () => posthogServerMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) import { GET, POST } from '@/app/api/workspaces/[id]/byok-keys/route' diff --git a/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/restore/route.ts b/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/restore/route.ts index 9c492438d8d..742118ea5c3 100644 --- a/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/restore/route.ts +++ b/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/restore/route.ts @@ -6,8 +6,8 @@ import { internalSessionAuth, } from '@/lib/api/server/routes' import { internalFileAnalytics, internalFileErrorPolicies } from '@/lib/workspace-files/api' +import { restoreWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/folders' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { restoreWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/workspace-file-folders' export const POST = defineInternalJsonRoute({ contract: restoreWorkspaceFileFolderContract, diff --git a/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.ts b/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.ts index c5873d2fdfa..feaab1a073e 100644 --- a/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.ts +++ b/apps/sim/app/api/workspaces/[id]/files/folders/[folderId]/route.ts @@ -9,11 +9,11 @@ import { internalSessionAuth, } from '@/lib/api/server/routes' import { internalFileAnalytics, internalFileErrorPolicies } from '@/lib/workspace-files/api' -import { fileOperations } from '@/lib/workspace-files/application/operations' import { deleteWorkspaceFileFolderOperation, updateWorkspaceFileFolderOperation, -} from '@/lib/workspace-files/application/workspace-file-folders' +} from '@/lib/workspace-files/application/folders' +import { fileOperations } from '@/lib/workspace-files/application/operations' export const PATCH = defineInternalJsonRoute({ contract: updateWorkspaceFileFolderContract, diff --git a/apps/sim/app/api/workspaces/[id]/files/folders/route.ts b/apps/sim/app/api/workspaces/[id]/files/folders/route.ts index 4165d8f42d7..0c6d1805356 100644 --- a/apps/sim/app/api/workspaces/[id]/files/folders/route.ts +++ b/apps/sim/app/api/workspaces/[id]/files/folders/route.ts @@ -9,11 +9,11 @@ import { internalSessionAuth, } from '@/lib/api/server/routes' import { internalFileAnalytics, internalFileErrorPolicies } from '@/lib/workspace-files/api' -import { fileOperations } from '@/lib/workspace-files/application/operations' import { createWorkspaceFileFolderOperation, listWorkspaceFileFoldersOperation, -} from '@/lib/workspace-files/application/workspace-file-folders' +} from '@/lib/workspace-files/application/folders' +import { fileOperations } from '@/lib/workspace-files/application/operations' export const GET = defineInternalJsonRoute({ contract: listWorkspaceFileFoldersContract, diff --git a/apps/sim/app/api/workspaces/[id]/files/route.ts b/apps/sim/app/api/workspaces/[id]/files/route.ts index 2d29ddfad10..66598ae7030 100644 --- a/apps/sim/app/api/workspaces/[id]/files/route.ts +++ b/apps/sim/app/api/workspaces/[id]/files/route.ts @@ -7,7 +7,7 @@ import { internalRateLimits, internalSessionAuth, } from '@/lib/api/server/routes' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { internalFileAnalytics, internalFileErrorPolicies, diff --git a/apps/sim/app/api/workspaces/[id]/inbox/route.test.ts b/apps/sim/app/api/workspaces/[id]/inbox/route.test.ts index d0273dfc502..0b5f413c237 100644 --- a/apps/sim/app/api/workspaces/[id]/inbox/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/inbox/route.test.ts @@ -33,7 +33,7 @@ vi.mock('@/lib/mothership/inbox/lifecycle', () => ({ vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) diff --git a/apps/sim/app/api/workspaces/[id]/permissions/route.test.ts b/apps/sim/app/api/workspaces/[id]/permissions/route.test.ts index 3174e6c514e..c0a70b47a38 100644 --- a/apps/sim/app/api/workspaces/[id]/permissions/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/permissions/route.test.ts @@ -40,7 +40,7 @@ vi.mock('@/lib/credentials/environment', () => credentialsEnvironmentMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/app/api/workspaces/[id]/visit/route.test.ts b/apps/sim/app/api/workspaces/[id]/visit/route.test.ts index 64293b76426..52bd332525b 100644 --- a/apps/sim/app/api/workspaces/[id]/visit/route.test.ts +++ b/apps/sim/app/api/workspaces/[id]/visit/route.test.ts @@ -13,7 +13,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workspaces/visits', () => ({ recordWorkspaceVisitRecord: hoisted.record })) import { OrchestrationError } from '@/lib/core/orchestration/types' diff --git a/apps/sim/app/benchmark/benchmark-console.test.tsx b/apps/sim/app/benchmark/benchmark-console.test.tsx index 0237c8d8850..14481c394cc 100644 --- a/apps/sim/app/benchmark/benchmark-console.test.tsx +++ b/apps/sim/app/benchmark/benchmark-console.test.tsx @@ -13,7 +13,7 @@ import { type BenchmarkCase, updateBenchmarkContract } from '@/lib/api/contracts import { BenchmarkConsole } from '@/app/benchmark/benchmark-console' import { useSettingsDirtyStore } from '@/stores/settings/dirty/store' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('next/navigation', () => nextNavigationMock) let root: Root diff --git a/apps/sim/app/desktop/connect/connect-launcher.tsx b/apps/sim/app/desktop/connect/connect-launcher.tsx index 165c5930a2d..df2f07d48b2 100644 --- a/apps/sim/app/desktop/connect/connect-launcher.tsx +++ b/apps/sim/app/desktop/connect/connect-launcher.tsx @@ -3,7 +3,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { Chip } from '@sim/emcn' import { getErrorMessage } from '@sim/utils/errors' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { getPerRequestOAuthLinkScopes } from '@/lib/oauth/utils' import { DesktopHandoffShell } from '@/app/desktop/components/desktop-handoff-shell' diff --git a/apps/sim/app/desktop/connect/page.test.tsx b/apps/sim/app/desktop/connect/page.test.tsx index 5cdb5f01801..131b0214d39 100644 --- a/apps/sim/app/desktop/connect/page.test.tsx +++ b/apps/sim/app/desktop/connect/page.test.tsx @@ -4,7 +4,7 @@ import { nextNavigationMock } from '@sim/testing/mocks/next-navigation.mock' import { urlsMockFns } from '@sim/testing/mocks/urls.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) /** Keeps the landing-page barrel the real shell pulls in out of this graph. */ vi.mock('@/app/desktop/components/desktop-handoff-shell', () => ({ diff --git a/apps/sim/app/desktop/connect/switch-account.tsx b/apps/sim/app/desktop/connect/switch-account.tsx index d2be918b9e9..bdf33f8cd5d 100644 --- a/apps/sim/app/desktop/connect/switch-account.tsx +++ b/apps/sim/app/desktop/connect/switch-account.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { Chip } from '@sim/emcn' -import { signOut } from '@/lib/auth/auth-client' +import { signOut } from '@/lib/auth/client' interface SwitchAccountProps { /** Where to return once the right account is signed in. */ diff --git a/apps/sim/app/enterprise/claim/[id]/enterprise-owner-claim.tsx b/apps/sim/app/enterprise/claim/[id]/enterprise-owner-claim.tsx index 371c0b5420b..f8a40e5eea9 100644 --- a/apps/sim/app/enterprise/claim/[id]/enterprise-owner-claim.tsx +++ b/apps/sim/app/enterprise/claim/[id]/enterprise-owner-claim.tsx @@ -8,7 +8,7 @@ import { acceptEnterpriseOwnerClaimContract, type EnterpriseOwnerClaimDetails, } from '@/lib/api/contracts/enterprise-owner-claims' -import { client, useSession } from '@/lib/auth/auth-client' +import { client, useSession } from '@/lib/auth/client' import { APP_ENTRY_PATH } from '@/lib/navigation/paths' import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect' import { InviteLayout, InviteStatusCard } from '@/app/invite/components' diff --git a/apps/sim/app/f/[token]/opengraph-image.tsx b/apps/sim/app/f/[token]/opengraph-image.tsx index 2d56c0e3b2f..db89ff9eff3 100644 --- a/apps/sim/app/f/[token]/opengraph-image.tsx +++ b/apps/sim/app/f/[token]/opengraph-image.tsx @@ -1,5 +1,5 @@ import { COVER_OG_SIZE, createCoverOgImage } from '@/lib/og/cover-image' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' import { buildProvenance } from '@/app/f/[token]/utils' export const dynamic = 'force-dynamic' diff --git a/apps/sim/app/f/[token]/page.tsx b/apps/sim/app/f/[token]/page.tsx index 2c59e81d057..8722e80b832 100644 --- a/apps/sim/app/f/[token]/page.tsx +++ b/apps/sim/app/f/[token]/page.tsx @@ -8,7 +8,7 @@ import { isEmailAllowed, validateAuthToken, } from '@/lib/core/security/deployment' -import { resolveActiveShareByToken } from '@/lib/public-shares/share-manager' +import { resolveActiveShareByToken } from '@/lib/public-shares/manager' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' import { PublicFileAuth } from '@/app/f/[token]/public-file-auth' import { PublicFileEmailAuth } from '@/app/f/[token]/public-file-email-auth' diff --git a/apps/sim/app/invite/[id]/invite.test.tsx b/apps/sim/app/invite/[id]/invite.test.tsx index 31607d0dedc..d1c7d3f44c5 100644 --- a/apps/sim/app/invite/[id]/invite.test.tsx +++ b/apps/sim/app/invite/[id]/invite.test.tsx @@ -27,7 +27,7 @@ vi.mock('@/lib/api/client/request', () => apiClientRequestMock) vi.mock('@/stores', () => ({ clearUserData: mockClearUserData })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/invite/components/layout', () => ({ default: ({ children }: { children: ReactNode }) => children, diff --git a/apps/sim/app/invite/[id]/invite.tsx b/apps/sim/app/invite/[id]/invite.tsx index 288c3f19eec..ccd018a101f 100644 --- a/apps/sim/app/invite/[id]/invite.tsx +++ b/apps/sim/app/invite/[id]/invite.tsx @@ -9,7 +9,7 @@ import { useParams, useRouter, useSearchParams } from 'next/navigation' import { ApiClientError } from '@/lib/api/client/errors' import { requestJson } from '@/lib/api/client/request' import { acceptInvitationContract } from '@/lib/api/contracts/invitations' -import { client, useSession } from '@/lib/auth/auth-client' +import { client, useSession } from '@/lib/auth/client' import { APP_ENTRY_PATH } from '@/lib/navigation/paths' import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect' import { InvitationDisclosure, InviteLayout, InviteStatusCard } from '@/app/invite/components' diff --git a/apps/sim/app/o/[organizationId]/benchmark/benchmark.test.tsx b/apps/sim/app/o/[organizationId]/benchmark/benchmark.test.tsx index 15346fcdba4..99e1126e9fb 100644 --- a/apps/sim/app/o/[organizationId]/benchmark/benchmark.test.tsx +++ b/apps/sim/app/o/[organizationId]/benchmark/benchmark.test.tsx @@ -9,7 +9,7 @@ import { createRoot } from 'react-dom/client' import { expect, it, vi } from 'vitest' import { Benchmark } from '@/app/o/[organizationId]/benchmark/benchmark' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/o/[organizationId]/benchmark/components', () => ({ BenchmarkDetail: () => null, diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx index eb07b37568a..eb575a23ef3 100644 --- a/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx +++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/organization-sidebar.tsx @@ -22,7 +22,7 @@ import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organ import { OrganizationSettingsSidebar } from '@/app/o/[organizationId]/settings/organization-settings-sidebar' import { useSidebarChrome } from '@/app/workspace/[workspaceId]/components/workspace-chrome' import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider' -import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands' import { HelpModal, isNavItemActive, diff --git a/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx b/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx index aa3b1c5a65a..0b8d73bc4f2 100644 --- a/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx +++ b/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx @@ -62,7 +62,7 @@ vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-resource-panel', () => ({ vi.mock('@/app/workspace/[workspaceId]/home/components/chat-resource-panel', () => ({ ChatResourcePanel: mocks.resourcePanel, })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/uploads/client/session-upload', () => ({ uploadInternalFileSession: mocks.upload })) vi.mock('@/lib/core/utils/browser-storage', () => ({ MothershipHandoffStorage: { consume: mocks.consume }, diff --git a/apps/sim/app/o/[organizationId]/home/organization-home.tsx b/apps/sim/app/o/[organizationId]/home/organization-home.tsx index 305ec3db460..a4a7af5c530 100644 --- a/apps/sim/app/o/[organizationId]/home/organization-home.tsx +++ b/apps/sim/app/o/[organizationId]/home/organization-home.tsx @@ -8,7 +8,7 @@ import { useQueryStates } from 'nuqs' import { requestJson } from '@/lib/api/client/request' import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge' import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { MothershipHandoffStorage } from '@/lib/core/utils/browser-storage' import { getMothershipAttachmentPreviewUrl, diff --git a/apps/sim/app/o/[organizationId]/layout.test.tsx b/apps/sim/app/o/[organizationId]/layout.test.tsx index b0605af0603..1598aedf5b6 100644 --- a/apps/sim/app/o/[organizationId]/layout.test.tsx +++ b/apps/sim/app/o/[organizationId]/layout.test.tsx @@ -26,7 +26,7 @@ vi.mock('@/hooks/use-mothership-chat-events', () => ({ useMothershipChatEvents: mockUseMothershipChatEvents, })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/hooks/queries/admin-users', () => ({ useStopImpersonating: () => ({ mutate: vi.fn(), isPending: false }), })) diff --git a/apps/sim/app/o/[organizationId]/providers/organization-provider.test.tsx b/apps/sim/app/o/[organizationId]/providers/organization-provider.test.tsx index a680b0391f7..6c04e9e30b9 100644 --- a/apps/sim/app/o/[organizationId]/providers/organization-provider.test.tsx +++ b/apps/sim/app/o/[organizationId]/providers/organization-provider.test.tsx @@ -14,7 +14,7 @@ const { mockUseMothershipChatEvents } = vi.hoisted(() => ({ vi.mock('@/app/workspace/providers/socket-provider', () => ({ SocketProvider: ({ children }: { children: import('react').ReactNode }) => children, })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/hooks/use-mothership-chat-events', () => ({ useMothershipChatEvents: mockUseMothershipChatEvents, })) diff --git a/apps/sim/app/o/[organizationId]/providers/organization-provider.tsx b/apps/sim/app/o/[organizationId]/providers/organization-provider.tsx index c398a484752..526fb7b39cc 100644 --- a/apps/sim/app/o/[organizationId]/providers/organization-provider.tsx +++ b/apps/sim/app/o/[organizationId]/providers/organization-provider.tsx @@ -1,7 +1,7 @@ 'use client' import { createContext, type ReactNode, useContext } from 'react' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import type { OrganizationSurfaceContext } from '@/lib/organizations/surface' import { SourceHistoryProvider } from '@/app/workspace/[workspaceId]/home/components/message-content/components/source-history-context' import { SocketProvider } from '@/app/workspace/providers/socket-provider' diff --git a/apps/sim/app/o/[organizationId]/settings/components/integrations/live-search-policy-modal.tsx b/apps/sim/app/o/[organizationId]/settings/components/integrations/live-search-policy-modal.tsx index 3d184b8a2ba..220404049ef 100644 --- a/apps/sim/app/o/[organizationId]/settings/components/integrations/live-search-policy-modal.tsx +++ b/apps/sim/app/o/[organizationId]/settings/components/integrations/live-search-policy-modal.tsx @@ -26,7 +26,7 @@ import { type LiveSearchPolicy, normalizeLiveSearchPolicy, } from '@/lib/sim-search/live/policy-schema' -import { searchSetupParam, serializeSearchSetup } from '@/lib/sim-search/search-params' +import { searchSetupParam, serializeSearchSetup } from '@/lib/sim-search/params' import { SearchSourcePagination } from '@/app/o/[organizationId]/settings/components/integrations/search-source-pagination' import { useSearchSources } from '@/hooks/queries/kb/connectors' import { useUpdateSearchIntegration } from '@/hooks/queries/search-integrations' diff --git a/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.test.tsx b/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.test.tsx index 251045dc38d..e3b8d365100 100644 --- a/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.test.tsx +++ b/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.test.tsx @@ -80,7 +80,7 @@ const mocks = vi.hoisted(() => ({ connectorsQuery: vi.fn(), })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/hooks/use-oauth-return', () => ({ useOAuthReturnForKBConnectors: mocks.oauthReturn })) vi.mock('@/hooks/queries/search-integrations', () => ({ useUpdateSearchIntegration: () => ({ mutate: mocks.updateSearchIntegration }), diff --git a/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.tsx b/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.tsx index 017f383ef90..c0fd9c270cf 100644 --- a/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.tsx +++ b/apps/sim/app/o/[organizationId]/settings/components/integrations/search-source-setup.tsx @@ -15,7 +15,7 @@ import { Search } from '@sim/emcn/icons' import dynamic from 'next/dynamic' import { useRouter } from 'next/navigation' import { useQueryState, useQueryStates } from 'nuqs' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { type ResourceScope, resourceScopeFields, @@ -29,7 +29,7 @@ import { managedSourceParam, searchSetupAccessParam, searchSetupParam, -} from '@/lib/sim-search/search-params' +} from '@/lib/sim-search/params' import { IntegrationTile } from '@/app/workspace/[workspaceId]/integrations/components/integrations-showcase' import { SettingsEmptyState, diff --git a/apps/sim/app/o/[organizationId]/settings/components/integrations/slack-account-setup.tsx b/apps/sim/app/o/[organizationId]/settings/components/integrations/slack-account-setup.tsx index 695983461d0..b8c47c3d361 100644 --- a/apps/sim/app/o/[organizationId]/settings/components/integrations/slack-account-setup.tsx +++ b/apps/sim/app/o/[organizationId]/settings/components/integrations/slack-account-setup.tsx @@ -9,7 +9,7 @@ import { ChipModalHeader, } from '@sim/emcn' import { useQueryState } from 'nuqs' -import { searchSetupParam, searchSetupReturnParam } from '@/lib/sim-search/search-params' +import { searchSetupParam, searchSetupReturnParam } from '@/lib/sim-search/params' import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider' import { connectedAccountsParam } from '@/app/o/[organizationId]/settings/components/integrations/search-params' import { SettingsQueryErrorState } from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state' diff --git a/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/page.tsx b/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/page.tsx index 6ecec2b7578..f21f8e30894 100644 --- a/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/page.tsx +++ b/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/page.tsx @@ -6,7 +6,7 @@ import { organizationRoutes } from '@/lib/navigation/paths' import { authorizeOrganizationSettingsSection } from '@/lib/settings/application/organization-section-access' import { SEARCH_SOURCE_TYPES } from '@/lib/sim-search/connectors' import { LIVE_SEARCH_SERVICE_PROVIDERS } from '@/lib/sim-search/live/policy-schema' -import { searchSetupParam } from '@/lib/sim-search/search-params' +import { searchSetupParam } from '@/lib/sim-search/params' import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect' import { serializeOrganizationPeople } from '@/app/o/[organizationId]/settings/components/integrations/search-params' import { OrganizationProviderDetail } from '@/app/o/[organizationId]/settings/integrations/providers/[connectorType]/provider-detail' diff --git a/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/provider-detail.tsx b/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/provider-detail.tsx index 0c300e32171..71309033faa 100644 --- a/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/provider-detail.tsx +++ b/apps/sim/app/o/[organizationId]/settings/integrations/providers/[connectorType]/provider-detail.tsx @@ -9,7 +9,7 @@ import { SettingsPanel } from '@/components/settings/settings-panel' import { organizationRoutes } from '@/lib/navigation/paths' import { getSearchConnectionLabels } from '@/lib/sim-search/connection-labels' import { getConnectorAccessAvailability } from '@/lib/sim-search/connectors' -import { searchSetupAccessParam, searchSetupParam } from '@/lib/sim-search/search-params' +import { searchSetupAccessParam, searchSetupParam } from '@/lib/sim-search/params' import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state' import { useOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider' import { connectedAccountsParam } from '@/app/o/[organizationId]/settings/components/integrations/search-params' diff --git a/apps/sim/app/o/[organizationId]/settings/organization-settings-sidebar.tsx b/apps/sim/app/o/[organizationId]/settings/organization-settings-sidebar.tsx index c1fa39d7b1f..d0eaaf656dd 100644 --- a/apps/sim/app/o/[organizationId]/settings/organization-settings-sidebar.tsx +++ b/apps/sim/app/o/[organizationId]/settings/organization-settings-sidebar.tsx @@ -5,7 +5,7 @@ import { usePathname } from 'next/navigation' import { ORGANIZATION_SETTINGS_GROUPS } from '@/components/settings/navigation' import { SettingsSidebar } from '@/components/settings/settings-sidebar' import { isApiClientError } from '@/lib/api/client/errors' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { isEnterprise } from '@/lib/billing/plan-helpers' import { hasPaidSubscriptionStatus, diff --git a/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx b/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx index d98808e8d61..ac8172b9cce 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/connect-oauth-modal/connect-oauth-modal.tsx @@ -15,7 +15,7 @@ import { } from '@sim/emcn' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { resourceScopeFields, resourceScopeFromOwner } from '@/lib/core/resource-scope' import type { OAuthReturnContext } from '@/lib/credentials/client-state' import { diff --git a/apps/sim/app/workspace/[workspaceId]/components/impersonation-banner/impersonation-banner.tsx b/apps/sim/app/workspace/[workspaceId]/components/impersonation-banner/impersonation-banner.tsx index 24a22ed7d60..38b37ccab33 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/impersonation-banner/impersonation-banner.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/impersonation-banner/impersonation-banner.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { Banner } from '@sim/emcn' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { APP_ENTRY_PATH } from '@/lib/navigation/paths' import { useStopImpersonating } from '@/hooks/queries/admin-users' import { clearUserData } from '@/stores' diff --git a/apps/sim/app/workspace/[workspaceId]/components/invite-modal/invite-modal.tsx b/apps/sim/app/workspace/[workspaceId]/components/invite-modal/invite-modal.tsx index 3645f6d8ac8..edf3d280fcf 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/invite-modal/invite-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/invite-modal/invite-modal.tsx @@ -14,7 +14,7 @@ import { } from '@sim/emcn' import { createLogger } from '@sim/logger' import type { BatchInvitationResult } from '@/lib/api/contracts/invitations' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { isEnterprise } from '@/lib/billing/plan-helpers' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' import { quickValidateEmail } from '@/lib/messaging/email/validation' diff --git a/apps/sim/app/workspace/[workspaceId]/components/session-expired/session-expired.tsx b/apps/sim/app/workspace/[workspaceId]/components/session-expired/session-expired.tsx index 788951a6cd5..fcd3be34ece 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/session-expired/session-expired.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/session-expired/session-expired.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { Chip, cn, useNativeSurfaceOcclusionReady } from '@sim/emcn' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { recoverFromStaleSession } from '@/lib/auth/stale-session-recovery' /** diff --git a/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx b/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx index 905645d932f..d168f05f423 100644 --- a/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx +++ b/apps/sim/app/workspace/[workspaceId]/components/workspace-chrome/workspace-chrome.tsx @@ -20,7 +20,7 @@ import { SidebarTooltip } from '@/app/workspace/[workspaceId]/w/components/sideb import { SIDEBAR_NO_MOTION_CLASS } from '@/app/workspace/[workspaceId]/w/components/sidebar/constants' import { isMobileViewport, useIsMobile } from '@/hooks/use-is-mobile' import { useSidebarWidth } from '@/hooks/use-sidebar-width' -import { useFullscreenOriginStore } from '@/stores/fullscreen-origin' +import { useFullscreenOriginStore } from '@/stores/fullscreen-origin/store' import { useSearchModalStore } from '@/stores/modals/search/store' import { useSidebarStore } from '@/stores/sidebar/store' diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.test.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.test.ts index e916f00c85f..63f8798e512 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.test.ts @@ -5,7 +5,7 @@ vi.mock('@/lib/uploads/utils/validation', () => ({ SUPPORTED_CODE_EXTENSIONS: ['js', 'ts', 'py', 'go', 'rs', 'sh', 'sql'], })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) import { resolveFileCategory } from './file-category' diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.ts index 273889fbd59..1a8fe6c41ef 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.ts +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-category.ts @@ -1,4 +1,4 @@ -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import { normalizeMimeType } from '@/lib/uploads/utils/mime' import { SUPPORTED_CODE_EXTENSIONS } from '@/lib/uploads/utils/validation' diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx index c1e9e519f12..1332f42984d 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/file-viewer.tsx @@ -9,7 +9,7 @@ import { TEXT_PREVIEW_SIZE_MESSAGE, } from '@/lib/uploads/client/text-content' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { resolveMediaMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveMediaMimeType } from '@/lib/uploads/utils/file' import { useWorkspaceFileBinary, useWorkspaceFileContent, diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx index f197ce717f1..dd87419b3ac 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel.tsx @@ -5,7 +5,7 @@ import { useRouter } from 'next/navigation' import { useTheme } from 'next-themes' import '@sim/emcn/components/code/code.css' import { CSV_PREVIEW_MAX_ROWS } from '@/lib/api/contracts/workspace-file-table' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import { normalizeMimeType } from '@/lib/uploads/utils/mime' import { SIM_ARTIFACT_SHELL, diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared.tsx index a979162c088..c6afbb382eb 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared.tsx @@ -4,7 +4,7 @@ import { Component, type ErrorInfo, memo, type ReactNode } from 'react' import { cn } from '@sim/emcn' import { Loader } from '@sim/emcn/icons' import { createLogger } from '@sim/logger' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' const logger = createLogger('FilePreview') diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/editor-lifecycle.test.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/editor-lifecycle.test.tsx index 674f9f97158..91f7f9abc4e 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/editor-lifecycle.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/editor-lifecycle.test.tsx @@ -33,7 +33,7 @@ vi.mock( 'next/navigation', async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock ) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/hooks/queries/workspace-files', () => ({ useUploadWorkspaceFile: () => ({ mutateAsync: uploadFile }), })) diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.tsx index 9022a383a46..a45cfa6288b 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/rich-markdown-editor.tsx @@ -18,7 +18,7 @@ import { isChangeOrigin } from '@tiptap/extension-collaboration' import type { Editor } from '@tiptap/react' import { EditorContent, useEditor } from '@tiptap/react' import { useRouter } from 'next/navigation' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { buildFileSelectionLabel, truncateSelectionText, diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/text-editor.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/text-editor.tsx index aa2df459009..f1b6be2eee9 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/text-editor.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/text-editor.tsx @@ -26,7 +26,7 @@ import { } from '@/lib/mothership/chat/selection-context' import type { FileDownloadSource } from '@/lib/uploads/client/download' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import { isSimPageSource, SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' import { EditorContextMenu } from '@/app/workspace/[workspaceId]/files/components/file-viewer/editor-context-menu' import { FileSaveConflict } from '@/app/workspace/[workspaceId]/files/components/file-viewer/file-save-conflict' diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content.ts index 483094b9ef3..6b351f60e2a 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content.ts +++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content.ts @@ -5,7 +5,7 @@ import { toast } from '@sim/emcn' import { isApiClientError } from '@/lib/api/client/errors' import { saveBlob } from '@/lib/uploads/client/download' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { GENERATED_DOCUMENT_SOURCE_TYPES } from '@/lib/uploads/utils/file-utils' +import { GENERATED_DOCUMENT_SOURCE_TYPES } from '@/lib/uploads/utils/file' import { INITIAL_TEXT_EDITOR_CONTENT_STATE, type SyncTextEditorContentStateOptions, diff --git a/apps/sim/app/workspace/[workspaceId]/files/files.tsx b/apps/sim/app/workspace/[workspaceId]/files/files.tsx index b2e8d34cd92..23724ba11ce 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/files.tsx +++ b/apps/sim/app/workspace/[workspaceId]/files/files.tsx @@ -43,7 +43,7 @@ import { isAudioFileType, isVideoFileType, resolveEffectiveMimeType, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { isSupportedExtension } from '@/lib/uploads/utils/validation' import { SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' import { FindBar } from '@/app/workspace/[workspaceId]/components/find-bar/find-bar' diff --git a/apps/sim/app/workspace/[workspaceId]/files/prefetch.ts b/apps/sim/app/workspace/[workspaceId]/files/prefetch.ts index 9a6772782d4..0b5668545cb 100644 --- a/apps/sim/app/workspace/[workspaceId]/files/prefetch.ts +++ b/apps/sim/app/workspace/[workspaceId]/files/prefetch.ts @@ -1,6 +1,6 @@ import type { QueryClient } from '@tanstack/react-query' import { listWorkspaceFileFoldersContract } from '@/lib/api/contracts/workspace-file-folders' -import { listWorkspaceFileFolders } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { listWorkspaceFileFolders } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { listAllWorkspaceFiles } from '@/lib/workspace-files/application/list-workspace-files' import { getWorkspaceHostContextForViewer } from '@/lib/workspaces/host-context' import { authorizeResourcePrefetch } from '@/app/workspace/[workspaceId]/lib/authorize-resource-prefetch' diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/credits-chip/credits-chip.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/credits-chip/credits-chip.tsx index 1accd4478d1..75a30c8482d 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/credits-chip/credits-chip.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/credits-chip/credits-chip.tsx @@ -5,7 +5,7 @@ import { Chip, ChipTag, Tooltip } from '@sim/emcn' import { Credit } from '@sim/emcn/icons' import { useQueryClient } from '@tanstack/react-query' import { useParams, useRouter } from 'next/navigation' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { formatCredits } from '@/lib/billing/credits/conversion' import { buildUpgradeHref } from '@/lib/billing/upgrade-reasons' import { canManageWorkspaceBilling } from '@/lib/billing/workspace-permissions' diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx index 060e04932ff..2189605db3b 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/knowledge-search-results.tsx @@ -5,7 +5,7 @@ import { Chip } from '@sim/emcn' import { useQueryStates } from 'nuqs' import { ActivityStatus } from '@/components/ui/activity-status' import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { type ResourceScope, resourceScopeKey } from '@/lib/core/resource-scope' import { SearchFilters } from '@/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-filters' import { diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx index d96bbdea681..74b4ca76313 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/knowledge-search-results/search-transitions.test.tsx @@ -25,7 +25,7 @@ const mocks = vi.hoisted(() => ({ summarize: vi.fn(), urlUpdate: vi.fn(), })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/api/client/request', () => apiClientRequestMock) vi.mock('next/navigation', () => nextNavigationMock) vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock) diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view.tsx index 7efbdf03aa6..5b584a432df 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view.tsx @@ -5,9 +5,9 @@ import { ActivityTextColumn } from '@/components/ui/activity-status' import { ThinkingLoader } from '@/components/ui/thinking-loader' import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport' import type { ToolActivity } from '@/lib/mothership/generated/protocol' +import { readToolActivity } from '@/lib/mothership/tools/activity' +import { getToolDisplayTitle } from '@/lib/mothership/tools/display' import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools' -import { readToolActivity } from '@/lib/mothership/tools/tool-activity' -import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display' import { ActivityStream } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/activity-stream' import { collectGroupTools, diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-activity-group.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-activity-group.tsx index d3ff86a946a..39b5c6bb993 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-activity-group.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-activity-group.tsx @@ -8,12 +8,9 @@ import { RunCode, SearchWorkspace, } from '@/lib/mothership/generated/tool-catalog-v1' +import { getToolActivitySummaryActions, readToolActivity } from '@/lib/mothership/tools/activity' +import { getToolStatusDisplayTitle } from '@/lib/mothership/tools/display' import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' -import { - getToolActivitySummaryActions, - readToolActivity, -} from '@/lib/mothership/tools/tool-activity' -import { getToolStatusDisplayTitle } from '@/lib/mothership/tools/tool-display' import { ActivityStream } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/activity-stream' import { getNewestRunningTool } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-content' import { getSearchActivitySources } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/search-activity-details' diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-title.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-title.ts index 6ed9702b6c5..3b1645140da 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-title.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-call-title.ts @@ -1,11 +1,11 @@ import { useEffect, useMemo, useState } from 'react' import { PrepareFileEdit, Wait as WaitTool } from '@/lib/mothership/generated/tool-catalog-v1' -import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' import { getToolInProgressTitle, getToolStatusDisplayTitle, getWaitCountdownTitle, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' +import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' import type { ToolCallData } from '@/app/workspace/[workspaceId]/home/types' /** diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/organization-secret-input.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/organization-secret-input.tsx index 3e18dde09d6..2a3cc22afca 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/organization-secret-input.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/organization-secret-input.tsx @@ -3,7 +3,7 @@ import { createContext, type ReactNode, useContext } from 'react' import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link' import { ApiClientError } from '@/lib/api/client/errors' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { organizationRoutes } from '@/lib/navigation/paths' import { useOptionalOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider' import { diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/personal-credential-card.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/personal-credential-card.test.tsx index 354dd0fe988..b6535bf2d1f 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/personal-credential-card.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/personal-credential-card.test.tsx @@ -31,7 +31,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('next/navigation', () => nextNavigationMock) vi.mock('@/lib/desktop', () => libDesktopMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/workspace/[workspaceId]/providers/workspace-permissions-provider', () => ({ useUserPermissionsContext: () => ({ canEdit: mocks.canEdit }), })) diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.ts index 00894654cba..95a3348e19b 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.ts @@ -2,13 +2,13 @@ import { authClientMock } from '@sim/testing/mocks/auth-client.mock' import { describe, expect, it, vi } from 'vitest' /** - * `@/lib/auth/auth-client` builds a Better Auth client at module scope, which + * `@/lib/auth/client` builds a Better Auth client at module scope, which * throws when NEXT_PUBLIC_APP_URL is absent from the environment (and under * `isolate: false` an earlier file may have imported the graph in a polluted * env). These tests only exercise pure parsing/model helpers, so stub the * client module out entirely. */ -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { formatUsageUpgradeTag } from '@/lib/billing/usage-upgrade' import type { diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.tsx index 9bc5cda0d38..f96d670ca23 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.tsx @@ -68,7 +68,7 @@ vi.mock('@/app/workspace/[workspaceId]/providers/workspace-permissions-provider' vi.mock('next/navigation', () => nextNavigationMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/workspace/[workspaceId]/home/components/chat-surface-context', () => ({ useChatSurface: () => ({ SearchConnectionComponent: ({ onConnected }: { onConnected?: () => void }) => ( diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx index 95d5c5fc74f..3b9e18f8a2a 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx @@ -31,7 +31,7 @@ import { import { isRecordLike, omit } from '@sim/utils/object' import { useParams } from 'next/navigation' import { getOrganizationSettingsHref } from '@/components/settings/navigation' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { buildHostedUpgradeUrl, HOSTED_BILLING_SETTINGS_URL } from '@/lib/billing/upgrade-reasons' import { canManageWorkspaceBilling } from '@/lib/billing/workspace-permissions' import { isBrowserAgentAvailable, sendBrowserPanelAction } from '@/lib/browser-agent/transport' diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts index 4dbf06d5e6f..f5ef8984a23 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.test.ts @@ -2,13 +2,13 @@ import { authClientMock } from '@sim/testing/mocks/auth-client.mock' import { describe, expect, it, vi } from 'vitest' /** - * `@/lib/auth/auth-client` builds a Better Auth client at module scope, which + * `@/lib/auth/client` builds a Better Auth client at module scope, which * throws when NEXT_PUBLIC_APP_URL is absent from the environment (and under * `isolate: false` an earlier file may have imported the graph in a polluted * env). These tests only exercise pure parsing/model helpers, so stub the * client module out entirely. */ -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { toDisplayMessage } from '@/lib/mothership/chat/display-message' import { normalizeMessage, stripToolResultOutput } from '@/lib/mothership/chat/persisted-message' diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx index e04ea68b9bd..5bf3b833b59 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx @@ -16,16 +16,16 @@ import { isPlainRecord } from '@sim/utils/object' import type { ToolActivity } from '@/lib/mothership/generated/protocol' import { PrepareFileEdit, Read as ReadTool } from '@/lib/mothership/generated/tool-catalog-v1' import type { TaskBlockInfo } from '@/lib/mothership/request/types' +import { readToolActivity } from '@/lib/mothership/tools/activity' import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools' import { resolveToolDisplay } from '@/lib/mothership/tools/client/store-utils' import { ClientToolCallState } from '@/lib/mothership/tools/client/tool-call-state' -import { readToolActivity } from '@/lib/mothership/tools/tool-activity' import { getToolDisplayTitle, getToolStatusDisplayTitle, humanizeToolName, normalizeToolActivityDescription, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' import { useChatSurface } from '@/app/workspace/[workspaceId]/home/components/chat-surface-context' import { hasAgentGroupItemContent, diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx index 4b700b7863c..ee06410f14c 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx @@ -28,14 +28,14 @@ import { useRouter } from 'next/navigation' import { DashboardResource } from '@/components/dashboards/dashboard-resource' import { isApiClientError } from '@/lib/api/client/errors' import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership-resources' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getWorkspaceUsageLimitAction } from '@/lib/billing/workspace-permissions' import { prefersInPlaceNavigation } from '@/lib/desktop' import type { FilePreviewSession } from '@/lib/mothership/request/session' import { stopRunToolForExecution } from '@/lib/mothership/tools/client/run-tool-execution' import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils' import { type FileDownloadSource, triggerFileDownload } from '@/lib/uploads/client/download' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { FileViewer, type PreviewMode, diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx index dbcc1f2f202..be794b83269 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.tsx @@ -7,7 +7,7 @@ import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership- import type { FilePreviewSession } from '@/lib/mothership/request/session' import { getChatResourceSelectionId } from '@/lib/mothership/resources/types' import type { FileDownloadSource } from '@/lib/uploads/client/download' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import { SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' import type { PreviewMode } from '@/app/workspace/[workspaceId]/files/components/file-viewer' import { diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/attached-files-list/attached-files-list.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/attached-files-list/attached-files-list.tsx index 0abfc644525..c542d67379a 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/attached-files-list/attached-files-list.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/attached-files-list/attached-files-list.tsx @@ -11,7 +11,7 @@ import { } from '@sim/emcn' import { X } from '@sim/emcn/icons' import { getDocumentIcon } from '@/components/icons/document-icons' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import type { AttachedFile } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments' /** diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts index 7ea9d6bd159..6d1911b6453 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts @@ -32,8 +32,8 @@ import { resolveResourceDisplayName, type ToolResourceContext, } from '@/lib/mothership/tools/client/resource-display' +import { getToolDisplayTitle, mvDisplayVerb } from '@/lib/mothership/tools/display' import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' -import { getToolDisplayTitle, mvDisplayVerb } from '@/lib/mothership/tools/tool-display' import type { ContentBlock } from '@/app/workspace/[workspaceId]/home/types' import { ToolCallStatus } from '@/app/workspace/[workspaceId]/home/types' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.ts index e874bb58f56..ed4a06743ac 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.ts @@ -1,10 +1,10 @@ import type { ToolActivity } from '@/lib/mothership/generated/protocol' import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract' +import { readToolActivity } from '@/lib/mothership/tools/activity' import { resolveNamedCliToolDisplayTitle, type ToolResourceContext, } from '@/lib/mothership/tools/client/resource-display' -import { readToolActivity } from '@/lib/mothership/tools/tool-activity' import { resolveIntegrationToolDisplayTitle, resolveStreamingToolDisplayTitle, diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model.ts index 283b7e0451e..ef24ea84065 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model.ts @@ -14,12 +14,12 @@ import { ToolActivity } from '@/lib/mothership/generated/protocol' import { CallIntegrationTool } from '@/lib/mothership/generated/tool-catalog-v1' import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract' import type { TaskBlockInfo } from '@/lib/mothership/request/types' -import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' import { CONTEXT_COMPACTION_DISPLAY_TITLE, normalizeToolActivityDescription, refineStreamingCliToolName, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' +import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' /** * The single deterministic model of one assistant turn, derived purely from the diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx index c348fb72a4c..adb0af8dbe8 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.dom.test.tsx @@ -59,11 +59,11 @@ vi.mock('@/lib/mothership/tools/client/local-filesystem', () => ({ vi.mock('@/lib/mothership/tools/client/browser-tool-execution', () => ({ executeBrowserToolOnClient: mockExecuteBrowserToolOnClient, })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.unmock('@/stores/execution/store') vi.unmock('@/stores/terminal') vi.unmock('@/stores/terminal/console/store') -vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils', () => ({ +vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution', () => ({ executeWorkflowWithFullLogging: mockExecuteWorkflow, })) diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts index 3f88152a0c8..c3ec9381f46 100644 --- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts +++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts @@ -27,7 +27,7 @@ import { reorderMothershipChatResourcesContract, } from '@/lib/api/contracts/mothership-chats' import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership-resources' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { buildResourceAttachments } from '@/lib/browser-agent/attachments' import { cancelActiveBrowserTools, initBrowserAgentTransport } from '@/lib/browser-agent/transport' import { MothershipHandoffStorage } from '@/lib/core/utils/browser-storage' diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx index 1650f0fbde9..b14b5b9aac3 100644 --- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx +++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx @@ -54,7 +54,7 @@ import { } from '@/lib/knowledge/documents/types' import { type FilterFieldType, getOperatorsForFieldType } from '@/lib/knowledge/filters/types' import type { DocumentData } from '@/lib/knowledge/types' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state' import { FOLDERED_RESOURCE_HEADERS, diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx index 37e25673d42..e793e84bbd5 100644 --- a/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/add-documents-modal/add-documents-modal.tsx @@ -18,7 +18,7 @@ import { assertMultiFileUploadAdmission, MultiFileUploadAdmissionError, } from '@/lib/uploads/client/admission' -import { formatFileSize, validateKnowledgeBaseFile } from '@/lib/uploads/utils/file-utils' +import { formatFileSize, validateKnowledgeBaseFile } from '@/lib/uploads/utils/file' import { ACCEPT_ATTRIBUTE } from '@/lib/uploads/utils/validation' import { useKnowledgeUpload } from '@/app/workspace/[workspaceId]/knowledge/hooks/use-knowledge-upload' diff --git a/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx b/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx index 8e44fa13a90..bdbd48d73c6 100644 --- a/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/knowledge/components/create-base-modal/create-base-modal.tsx @@ -31,7 +31,7 @@ import { assertMultiFileUploadAdmission, MultiFileUploadAdmissionError, } from '@/lib/uploads/client/admission' -import { formatFileSize, validateKnowledgeBaseFile } from '@/lib/uploads/utils/file-utils' +import { formatFileSize, validateKnowledgeBaseFile } from '@/lib/uploads/utils/file' import { ACCEPT_ATTRIBUTE } from '@/lib/uploads/utils/validation' import { useKnowledgeUpload } from '@/app/workspace/[workspaceId]/knowledge/hooks/use-knowledge-upload' import { useCreateKnowledgeBase, useDeleteKnowledgeBase } from '@/hooks/queries/kb/knowledge' diff --git a/apps/sim/app/workspace/[workspaceId]/lib/prefetch.test.ts b/apps/sim/app/workspace/[workspaceId]/lib/prefetch.test.ts index 604b87c7ffa..703c719c305 100644 --- a/apps/sim/app/workspace/[workspaceId]/lib/prefetch.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/lib/prefetch.test.ts @@ -56,10 +56,7 @@ vi.mock('@/lib/folders/queries', () => folderQueriesMock) vi.mock('@/lib/workspace-files/queries', () => ({ listWorkspaceFilesWithShares: mockListWorkspaceFilesWithShares, })) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) vi.mock('@/lib/pinned-items/queries', () => ({ listPinnedItemsForUser: mockListPinnedItemsForUser, })) diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx index 20fa8185d79..981a3b6732b 100644 --- a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx +++ b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx @@ -1,7 +1,7 @@ import { memo } from 'react' import { cn, handleKeyboardActivation } from '@sim/emcn' import { Workflow } from '@sim/emcn/icons' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { FloatingOverflowText } from '@/app/workspace/[workspaceId]/components/resource/components/floating-overflow-text' import { StatusBar, type StatusBarSegment } from '..' diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx index 8d310f38b29..d30e2e56305 100644 --- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx +++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx @@ -4,7 +4,7 @@ import { Button } from '@sim/emcn' import { Download } from '@sim/emcn/icons' import { createLogger } from '@sim/logger' import { useRouter } from 'next/navigation' -import { extractWorkspaceIdFromExecutionKey, getViewerUrl } from '@/lib/uploads/utils/file-utils' +import { extractWorkspaceIdFromExecutionKey, getViewerUrl } from '@/lib/uploads/utils/file' const logger = createLogger('FileCards') diff --git a/apps/sim/app/workspace/[workspaceId]/logs/utils.ts b/apps/sim/app/workspace/[workspaceId]/logs/utils.ts index a2dd27e1d6f..f6a88183e03 100644 --- a/apps/sim/app/workspace/[workspaceId]/logs/utils.ts +++ b/apps/sim/app/workspace/[workspaceId]/logs/utils.ts @@ -3,7 +3,7 @@ import { Badge, formatChartLatency } from '@sim/emcn' import { formatRelativeTime } from '@sim/utils/formatting' import { format } from 'date-fns' import { getIntegrationMetadata } from '@/lib/logs/get-trigger-options' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { getBlock } from '@/blocks/registry' import { CORE_TRIGGER_TYPES } from '@/stores/logs/filters/types' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx index abc83969fed..f44fcf13673 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx @@ -2,7 +2,7 @@ import dynamic from 'next/dynamic' import { getSettingsPermissionConfigKey } from '@/components/settings/navigation' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider' import { General } from '@/app/workspace/[workspaceId]/settings/components/general/general' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx index ecc3ebb644b..30f9d261452 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/admin/admin.tsx @@ -21,7 +21,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { useQueryStates } from 'nuqs' import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard' import type { MothershipEnvironment } from '@/lib/api/contracts' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { APP_ENTRY_PATH } from '@/lib/navigation/paths' import { AddUserModal } from '@/app/workspace/[workspaceId]/settings/components/admin/add-user-modal' import { diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx index 96d285f82e3..88a2a9afe14 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/api-keys/api-keys.tsx @@ -9,7 +9,7 @@ import { formatDate } from '@sim/utils/formatting' import { useParams } from 'next/navigation' import { canMutateWorkspaceSettingsSection } from '@/components/settings/navigation' import type { ApiKey } from '@/lib/api/contracts/api-keys' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { useOptionalWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider' import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider' import { RowActionsMenu } from '@/app/workspace/[workspaceId]/settings/components/row-actions-menu' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.tsx index 59d52bbd3f3..f9cabc91f93 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/billing/billing.tsx @@ -18,7 +18,7 @@ import { isOrgAdminRole } from '@sim/platform-authz/predicates' import { getErrorMessage } from '@sim/utils/errors' import { formatDate } from '@sim/utils/formatting' import { useRouter } from 'next/navigation' -import { useSession, useSubscription } from '@/lib/auth/auth-client' +import { useSession, useSubscription } from '@/lib/auth/client' import { ON_DEMAND_UNLIMITED } from '@/lib/billing/constants' import { CREDIT_MULTIPLIER, formatCreditCost } from '@/lib/billing/credits/conversion' import { diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/delete-account-modal.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/delete-account-modal.tsx index 9895db377cc..e29fd2ba543 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/delete-account-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/components/delete-account-modal.tsx @@ -5,7 +5,7 @@ import { ChipConfirmModal, ChipModalError, ChipModalField } from '@sim/emcn' import { createLogger } from '@sim/logger' import { sleep } from '@sim/utils/helpers' import { formatQuotedNameList, normalizeEmail } from '@sim/utils/string' -import { signOut } from '@/lib/auth/auth-client' +import { signOut } from '@/lib/auth/client' import { useAccountDeletionPlan, useDeleteAccount } from '@/hooks/queries/account-deletion' import { clearUserData } from '@/stores' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx index 123b4359e11..dd916ade3c1 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/general/general.tsx @@ -24,7 +24,7 @@ import dynamic from 'next/dynamic' import Image from 'next/image' import { useRouter } from 'next/navigation' import { useQueryState } from 'nuqs' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { signOutAndRedirect } from '@/lib/auth/sign-out' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' import { getBrowserTimezone, getTimezoneOptions } from '@/lib/core/utils/timezone' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/secrets/hooks/use-secret-value.ts b/apps/sim/app/workspace/[workspaceId]/settings/components/secrets/hooks/use-secret-value.ts index 4f841fd1bf5..0174fa4e267 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/secrets/hooks/use-secret-value.ts +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/secrets/hooks/use-secret-value.ts @@ -4,7 +4,7 @@ import { useCallback, useMemo, useState } from 'react' import { toast } from '@sim/emcn' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import type { WorkspaceCredential } from '@/hooks/queries/credentials' import { usePersonalEnvironment, diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx index 11e24b4e77e..e60537723d2 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/components/team-management/team-management.tsx @@ -5,7 +5,7 @@ import { Plus } from '@sim/emcn' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getSubscriptionAccessState } from '@/lib/billing/client/utils' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' import { getBaseUrl } from '@/lib/core/utils/urls' diff --git a/apps/sim/app/workspace/[workspaceId]/settings/secrets/[credentialId]/components/secret-usage-panel/secret-usage-panel.tsx b/apps/sim/app/workspace/[workspaceId]/settings/secrets/[credentialId]/components/secret-usage-panel/secret-usage-panel.tsx index c6137a5fde3..f8f2cbd88ba 100644 --- a/apps/sim/app/workspace/[workspaceId]/settings/secrets/[credentialId]/components/secret-usage-panel/secret-usage-panel.tsx +++ b/apps/sim/app/workspace/[workspaceId]/settings/secrets/[credentialId]/components/secret-usage-panel/secret-usage-panel.tsx @@ -5,7 +5,7 @@ import { ChipLink } from '@sim/emcn' import { formatDateTime } from '@sim/utils/formatting' import { SettingsActionChip } from '@/components/settings/settings-header' import type { SecretUsageEntryPayload, SecretUsageScope } from '@/lib/api/contracts' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { FloatingOverflowText } from '@/app/workspace/[workspaceId]/components/resource/components/floating-overflow-text' import { TriggerBadge } from '@/app/workspace/[workspaceId]/logs/utils' import { diff --git a/apps/sim/app/workspace/[workspaceId]/upgrade/upgrade.tsx b/apps/sim/app/workspace/[workspaceId]/upgrade/upgrade.tsx index 7ec5cadb581..1bad0a5626b 100644 --- a/apps/sim/app/workspace/[workspaceId]/upgrade/upgrade.tsx +++ b/apps/sim/app/workspace/[workspaceId]/upgrade/upgrade.tsx @@ -6,7 +6,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { useRouter } from 'next/navigation' import { useQueryState } from 'nuqs' import { PAGE_HEADER_BAR } from '@/components/page-header-bar' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getUpgradeCardCta, type PlanCardCta, @@ -35,7 +35,7 @@ import { upgradeReasonParam, upgradeUrlKeys, } from '@/app/workspace/[workspaceId]/upgrade/search-params' -import { useFullscreenOriginStore } from '@/stores/fullscreen-origin' +import { useFullscreenOriginStore } from '@/stores/fullscreen-origin/store' /** Enterprise "Talk to sales" books time with the sales team on Cal.com. */ const SALES_CAL_URL = 'https://cal.com/team/sim/demo' as const diff --git a/apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts b/apps/sim/app/workspace/[workspaceId]/utils/commands.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts rename to apps/sim/app/workspace/[workspaceId]/utils/commands.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.test.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.test.tsx index c5db1f7877d..81ac986839c 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.test.tsx @@ -10,7 +10,7 @@ import { Chat } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/ch import { useChatStore } from '@/stores/chat/store' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/providers/models', () => providersModelsMock) vi.mock('@/providers/utils', () => providersUtilsMock) vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution', () => ({ diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx index ce1c1e11ee6..d893750c5d4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx @@ -21,7 +21,7 @@ import { ArrowUp, CircleAlert, Download, MoreVertical, Paperclip, Square, X } fr import { createLogger } from '@sim/logger' import { generateId } from '@sim/utils/id' import { useShallow } from 'zustand/react/shallow' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { extractBlockIdFromOutputId, extractPathFromOutputId, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx index adc95e4e4ef..0ef91584739 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx @@ -1,7 +1,7 @@ import { memo, useCallback, useMemo } from 'react' import { createLogger } from '@sim/logger' import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider' -import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands' import { usePreventZoom } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks' import { useWorkflowDiffStore } from '@/stores/workflow-diff' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts index 14473fdddd3..b22b7bb418b 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts @@ -19,7 +19,7 @@ import { isAssistantImageType, } from '@/lib/uploads/shared/assistant-images' import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types' -import { resolveFileType } from '@/lib/uploads/utils/file-utils' +import { resolveFileType } from '@/lib/uploads/utils/file' import type { ChatRequestMode, FileAttachmentForApi, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx index 5a2f8ccfac6..37e61f5fcb4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx @@ -28,9 +28,9 @@ import { releaseDeployAction, tryAcquireDeployAction, } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-action-lock' +import { runPreDeployChecks } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/predeploy-checks' import type { DeployReadiness } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-readiness' import type { DeploymentViewState } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment-view-state' -import { runPreDeployChecks } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-predeploy-checks' import { normalizeName, startsWithUuid } from '@/executor/constants' import { useApiKeys } from '@/hooks/queries/api-keys' import { diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status.test.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status.test.ts similarity index 97% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status.test.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status.test.ts index da55b275cc7..9bf81e33eed 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import { type DeployButtonStatus, resolveDeployButtonStatus, -} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status' +} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status' type Input = Parameters[0] diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts index ca9d607a984..ba8953fe071 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts @@ -1,7 +1,7 @@ +export type { DeployButtonStatus } from './deploy-button-status' +export { resolveDeployButtonStatus } from './deploy-button-status' export { useChangeDetection } from './use-change-detection' export { useChangeDetectionCanary } from './use-change-detection-canary' -export type { DeployButtonStatus } from './use-deploy-button-status' -export { resolveDeployButtonStatus } from './use-deploy-button-status' export type { DeployReadiness } from './use-deploy-readiness' export { getDeployReadinessState, useDeployReadiness } from './use-deploy-readiness' export { useDeployment } from './use-deployment' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-predeploy-checks.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/predeploy-checks.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-predeploy-checks.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/predeploy-checks.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment-view-state.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment-view-state.ts index dfe78cba9b0..fe3ef6d62fd 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment-view-state.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment-view-state.ts @@ -1,9 +1,9 @@ -import { useChangeDetection } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection' -import { useChangeDetectionCanary } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection-canary' import { type DeployButtonStatus, resolveDeployButtonStatus, -} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-button-status' +} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/deploy-button-status' +import { useChangeDetection } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection' +import { useChangeDetectionCanary } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection-canary' import type { DeployReadiness } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deploy-readiness' import { useDeployedWorkflowState, useDeploymentInfo } from '@/hooks/queries/deployments' import type { WorkflowState } from '@/stores/workflows/workflow/types' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts index 4909fd4e467..9a0424730e4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react' import { toast } from '@sim/emcn' import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' -import { runPreDeployChecks } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-predeploy-checks' +import { runPreDeployChecks } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/predeploy-checks' import { useDeployWorkflow } from '@/hooks/queries/deployments' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' import { syncLocalDraftFromServer } from '@/stores/workflows/sync-local-draft' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx index bd16ea80e9e..5496e2e20c4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx @@ -17,7 +17,7 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c import { useActiveSearchTarget } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/providers/active-search-target-provider' import { getBlock } from '@/blocks/registry' import type { SubBlockConfig } from '@/blocks/types' -import { ResponseBlockHandler } from '@/executor/handlers/response/response-handler' +import { ResponseBlockHandler } from '@/executor/handlers/response/handler' import { useWorkspaceOrganizationAccounts } from '@/hooks/queries/organization-accounts' import { useDebounce } from '@/hooks/use-debounce' import { useOperationAccess } from '@/hooks/use-operation-access' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx index 4db94709dab..0d451c8ca53 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx @@ -14,7 +14,7 @@ import { requestJson } from '@/lib/api/client/request' import { fileDeleteContract } from '@/lib/api/contracts/storage-transfer' import { ROOT_FOLDER_PATH } from '@/lib/folders/paths' import { readFolderPaths } from '@/lib/folders/selection' -import { formatFileSize, getExtensionFromMimeType } from '@/lib/uploads/utils/file-utils' +import { formatFileSize, getExtensionFromMimeType } from '@/lib/uploads/utils/file' import { containsReference } from '@/lib/workflows/sanitization/references' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' import { isFileInFolderScope } from '@/lib/workspace-files/folder-path-selection' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx index e756229a114..7099c3906cf 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx @@ -16,9 +16,9 @@ import { ChevronLeft } from '@sim/emcn/icons' import { getEffectiveBlockOutputType, getOutputPathsFromSchema, -} from '@/lib/workflows/blocks/block-outputs' -import { getBlockReferenceTags } from '@/lib/workflows/blocks/block-reference-tags' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +} from '@/lib/workflows/blocks/outputs' +import { getBlockReferenceTags } from '@/lib/workflows/blocks/reference-tags' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { KeyboardNavigationHandler } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler' import type { BlockTagGroup, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/workflow-selector/workflow-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/workflow-selector/workflow-selector-input.tsx index 5b35c3d4cc4..275750f43c0 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/workflow-selector/workflow-selector-input.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/workflow-selector/workflow-selector-input.tsx @@ -1,7 +1,7 @@ 'use client' import { useMemo } from 'react' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { useWorkflowScope } from '@/app/workspace/[workspaceId]/providers/workflow-scope-provider' import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox' import type { SubBlockConfig } from '@/blocks/types' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts index a509707db7c..bec0e7abcb1 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts @@ -1,7 +1,7 @@ import { useShallow } from 'zustand/react/shallow' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' -import { BlockPathCalculator } from '@/lib/workflows/blocks/block-path-calculator' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' +import { BlockPathCalculator } from '@/lib/workflows/blocks/path-calculator' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { getBlock } from '@/blocks' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' import { useSubBlockStore } from '@/stores/workflows/subblock/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx index d299ca93c93..47d0512f5e0 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx @@ -24,7 +24,7 @@ import { import { ChevronDown, Lock, Search } from '@sim/emcn/icons' import { usePostHog } from 'posthog-js/react' import { captureEvent } from '@/lib/posthog/client' -import { getTriggersForSidebar, hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { getTriggersForSidebar, hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { useWorkflowScope } from '@/app/workspace/[workspaceId]/providers/workflow-scope-provider' import { type DragItemInfo, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx index 42ecda5df92..c59e44e0e00 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx @@ -35,7 +35,7 @@ import { deleteCopilotChatContract, } from '@/lib/api/contracts/copilot' import { getWorkflowNormalizedStateContract } from '@/lib/api/contracts/workflows' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getWorkspaceUsageLimitAction } from '@/lib/billing/workspace-permissions' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' import { @@ -53,7 +53,7 @@ import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/provide import { useWorkflowScope } from '@/app/workspace/[workspaceId]/providers/workflow-scope-provider' import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider' import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider' -import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands' import { Deploy, Editor, @@ -85,10 +85,10 @@ import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow' import { usePermissionConfig } from '@/hooks/use-permission-config' import { useSettingsNavigation } from '@/hooks/use-settings-navigation' import { useChatStore } from '@/stores/chat/store' +import { useVariablesModalStore } from '@/stores/modals/variables/store' import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store' import type { ChatContext, PanelTab } from '@/stores/panel' import { usePanelStore } from '@/stores/panel' -import { useVariablesModalStore } from '@/stores/variables/modal' import { useVariablesStore } from '@/stores/variables/store' import { useWorkflowDiffStore } from '@/stores/workflow-diff/store' import { captureBaselineSnapshot } from '@/stores/workflow-diff/utils' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx index 83f593bba1a..b975de2ac59 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/workflow-search-replace.tsx @@ -34,7 +34,7 @@ import { useWorkflowScope, } from '@/app/workspace/[workspaceId]/providers/workflow-scope-provider' import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider' -import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands' import { ReplacementControls } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/components' import { useWorkflowResourceReplacementOptions } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/search-replace/hooks/use-workflow-resource-replacement-options' import { @@ -57,9 +57,9 @@ import { isWorkflowEffectivelyLocked } from '@/hooks/queries/utils/folder-tree' import { useWorkflowMap } from '@/hooks/queries/workflows' import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow' import { useChatStore } from '@/stores/chat/store' +import { useVariablesModalStore } from '@/stores/modals/variables/store' import { usePanelEditorSearchStore, usePanelEditorStore, usePanelStore } from '@/stores/panel' import type { ActiveSearchTarget } from '@/stores/panel/editor/store' -import { useVariablesModalStore } from '@/stores/variables/modal' import { useWorkflowSearchReplaceStore } from '@/stores/workflow-search-replace/store' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' import { useSubBlockStore } from '@/stores/workflows/subblock/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx index 6dc9e79090c..4b618ca5441 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx @@ -20,7 +20,7 @@ import Link from 'next/link' import { getEnv, isTruthy } from '@/lib/core/config/env' import { sendMothershipMessage } from '@/lib/mothership/events' import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider' -import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands' import { EntryBlockTile, LogRowContextMenu, diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx index d99548a4bda..4955fa91961 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables.tsx @@ -34,7 +34,7 @@ import { MIN_VARIABLES_HEIGHT, MIN_VARIABLES_WIDTH, useVariablesModalStore, -} from '@/stores/variables/modal' +} from '@/stores/modals/variables/store' import { useVariablesStore } from '@/stores/variables/store' import type { Variable } from '@/stores/variables/types' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx index cfa6cf7696f..4593562cee7 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx @@ -22,9 +22,9 @@ import { SelectAll } from '@sim/emcn/icons' import { createLogger } from '@sim/logger' import { useReactFlow } from '@xyflow/react' import { useShallow } from 'zustand/react/shallow' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider' -import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands' import { useShowActionBar, useUpdateGeneralSetting } from '@/hooks/queries/general-settings' import { useCanvasViewport } from '@/hooks/use-canvas-viewport' import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes.ts index e8f0b68a7f5..14995b92773 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { BlockPathCalculator } from '@/lib/workflows/blocks/block-path-calculator' +import { BlockPathCalculator } from '@/lib/workflows/blocks/path-calculator' import { SYSTEM_REFERENCE_PREFIXES } from '@/lib/workflows/sanitization/references' import { useWorkflowReferenceGraph } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/workflow-reference-scope' import { normalizeName } from '@/executor/constants' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-auto-layout.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-auto-layout.ts index da4e9a8a02a..d6ffac1a4b7 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-auto-layout.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-auto-layout.ts @@ -2,8 +2,8 @@ import { useCallback } from 'react' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { useReactFlow } from '@xyflow/react' -import type { AutoLayoutOptions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils' -import { applyAutoLayoutAndUpdateStore as applyAutoLayoutStandalone } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils' +import type { AutoLayoutOptions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout' +import { applyAutoLayoutAndUpdateStore as applyAutoLayoutStandalone } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout' import { useSnapToGridSize } from '@/hooks/queries/general-settings' import type { CanvasViewportOptions } from '@/hooks/use-canvas-viewport' import { useCanvasViewport } from '@/hooks/use-canvas-viewport' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts index b8c344783ab..f079448eea9 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts @@ -1,8 +1,8 @@ 'use client' import { useMemo } from 'react' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import type { SchemaField } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item' import { getBlock } from '@/blocks' import { useSubBlockStore } from '@/stores/workflows/subblock/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts index b24c6e15a5f..c2d78d3f4ed 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts @@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react' import { useBlockState } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks' import type { WorkflowBlockProps } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/types' import { useBlockCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-current-workflow' -import { getBlockRingStyles } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils' +import { getBlockRingStyles } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring' import { useLastRunPath } from '@/stores/execution' import { usePanelEditorStore, usePanelStore } from '@/stores/panel' import { useWorkflowRegistry } from '@/stores/workflows/registry/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts index 8605ea98a83..cba26618298 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts @@ -7,7 +7,7 @@ import { getBlockMetrics } from '@/lib/workflows/autolayout/utils' import { calculateContainerDimensions, clampPositionToContainer, -} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils' +} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position' import { getNodeDataDimension } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers' import { useWorkflowStore } from '@/stores/workflows/workflow/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.test.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.test.tsx index 98509d817bc..b174c1ab8b1 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.test.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.test.tsx @@ -160,7 +160,7 @@ vi.mock('@/lib/workflows/input-format', () => ({ isFileFieldType: () => false, })) -vi.mock('@/lib/workflows/triggers/trigger-utils', () => ({ +vi.mock('@/lib/workflows/triggers/utils', () => ({ extractTriggerMockPayload: () => ({}), selectBestTrigger: mockSelectBestTrigger, triggerNeedsMockPayload: () => false, @@ -191,7 +191,7 @@ vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow }), })) -vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils', () => ({ +vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution', () => ({ addHttpErrorConsoleEntry: vi.fn(), createBlockEventHandlers: () => ({ onBlockStarted: vi.fn(), diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts index e12407b8679..da0e81193d4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts @@ -34,16 +34,16 @@ import type { StreamToolData, } from '@/lib/workflows/executor/execution-events' import { collectInputFormatFiles, isFileFieldType } from '@/lib/workflows/input-format' -import { - extractTriggerMockPayload, - selectBestTrigger, - triggerNeedsMockPayload, -} from '@/lib/workflows/triggers/trigger-utils' import { resolveStartCandidates, StartBlockPath, TriggerUtils, } from '@/lib/workflows/triggers/triggers' +import { + extractTriggerMockPayload, + selectBestTrigger, + triggerNeedsMockPayload, +} from '@/lib/workflows/triggers/utils' import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow' import { getRunFromBlockDependencyState } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/run-from-block' import { @@ -59,7 +59,7 @@ import { addExecutionErrorConsoleEntry as sharedAddExecutionErrorConsoleEntry, handleExecutionCancelledConsole as sharedHandleExecutionCancelledConsole, handleExecutionErrorConsole as sharedHandleExecutionErrorConsole, -} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils' +} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution' import { getBlock } from '@/blocks' import type { SerializableExecutionState } from '@/executor/execution/types' import type { BlockLog, BlockState, ExecutionResult, StreamingExecution } from '@/executor/types' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection-utils.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts index d7ade05eb8f..5a178ee8079 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts @@ -1,7 +1,7 @@ -export * from './auto-layout-utils' -export * from './block-protection-utils' -export * from './block-ring-utils' -export * from './node-position-utils' +export * from './auto-layout' +export * from './block-protection' +export * from './block-ring' +export * from './node-position' export * from './run-from-block' export * from './workflow-canvas-helpers' -export * from './workflow-execution-utils' +export * from './workflow-execution' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts index afcbc8034a8..5d503f3dbb1 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts @@ -2,7 +2,7 @@ import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS, getNoteBlockHeight } from '@sim import type { Edge, Node } from '@xyflow/react' import { isEqual } from 'es-toolkit' import { TriggerUtils } from '@/lib/workflows/triggers/triggers' -import { clampPositionToContainer } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils' +import { clampPositionToContainer } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position' import type { BlockState } from '@/stores/workflows/workflow/types' export const SUBFLOW_DROP_TARGET_CLASS = 'subflow-node-drop-target' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils-store.test.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-store.test.ts similarity index 99% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils-store.test.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-store.test.ts index 77a45a69a0a..20d54eb4317 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils-store.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-store.test.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.unmock('@/stores/terminal') vi.unmock('@/stores/terminal/console/store') -import { reconcileFinalBlockLogs } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils' +import { reconcileFinalBlockLogs } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution' import { useExecutionStore } from '@/stores/execution' import { useTerminalConsoleStore } from '@/stores/terminal/console/store' diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.test.ts similarity index 99% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.test.ts index cddbaeb27a6..9e78c5d0173 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.test.ts @@ -7,7 +7,7 @@ import { handleExecutionCancelledConsole, handleExecutionErrorConsole, reconcileFinalBlockLogs, -} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils' +} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution' import type { BlockLog } from '@/executor/types' import { ExecutionStreamHttpError, @@ -16,7 +16,7 @@ import { } from '@/hooks/use-execution-stream' import { useExecutionStore } from '@/stores/execution' -describe('workflow-execution-utils', () => { +describe('workflow-execution', () => { beforeEach(() => { resetTerminalConsoleMock() vi.mocked(useExecutionStore.getState).mockReturnValue({ diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts similarity index 100% rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx index 686a7accb11..2bf2e959105 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx @@ -42,7 +42,7 @@ import { WORKFLOW_TARGET_HANDLE_ID, } from '@sim/workflow-types/workflow' import { useShallow } from 'zustand/react/shallow' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { consumeOAuthReturnContext, writeOAuthReturnContext } from '@/lib/credentials/client-state' import type { OAuthConnectEventDetail } from '@/lib/mothership/tools/client/base-tool' import type { OAuthProvider } from '@/lib/oauth' @@ -159,9 +159,9 @@ import { } from '@/stores/execution' import { useSearchModalStore } from '@/stores/modals/search/store' import type { PendingConnect } from '@/stores/modals/search/types' +import { useVariablesModalStore } from '@/stores/modals/variables/store' import { usePanelEditorSearchStore, usePanelEditorStore, usePanelStore } from '@/stores/panel' import { useUndoRedoStore } from '@/stores/undo-redo' -import { useVariablesModalStore } from '@/stores/variables/modal' import { useWorkflowDiffStore } from '@/stores/workflow-diff/store' import { useWorkflowSearchReplaceStore } from '@/stores/workflow-search-replace/store' import { prepareBlockState } from '@/stores/workflows/prepare-block-state' diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx index 00fe338e573..b1c85d14fe4 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx @@ -28,6 +28,7 @@ import { } from '@sim/emcn/icons' import { formatDuration } from '@sim/utils/formatting' import { ReactFlowProvider } from '@xyflow/react' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { extractReferencePrefixes } from '@/lib/workflows/sanitization/references' import { buildCanonicalIndexForSurface, @@ -37,7 +38,6 @@ import { isSubBlockVisibleForMode, isToolInputOnlySubBlock, } from '@/lib/workflows/subblocks/visibility' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' import { useWorkflowScope } from '@/app/workspace/[workspaceId]/providers/workflow-scope-provider' import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components' import { PreviewContextMenu } from '@/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu' diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx index 4ed71a6506f..cb13ddcef6d 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx @@ -47,7 +47,7 @@ import { getFolderPathNames } from '@/lib/folders/tree' import { sendMothershipMessage } from '@/lib/mothership/events' import { captureEvent } from '@/lib/posthog/client' import { toSearchToken } from '@/lib/search/tokens' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' import { useInvokeGlobalCommand } from '@/app/workspace/[workspaceId]/providers/global-commands-provider' import { diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx index 6b2ad581076..34141c4904c 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx @@ -24,7 +24,7 @@ import { import { SettingsIntentLink } from '@/components/settings/settings-intent-link' import { useSettingsNavigationState } from '@/components/settings/settings-navigation-provider' import { usePendingSettingsSelection } from '@/components/settings/use-pending-settings-selection' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { getSubscriptionAccessState } from '@/lib/billing/client' import { canViewWorkspaceBillingSettings } from '@/lib/billing/workspace-permissions' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx index 01b180d33ba..96a6788d874 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx @@ -44,7 +44,7 @@ import { createLogger } from '@sim/logger' import { useParams, usePathname, useRouter } from 'next/navigation' import { usePostHog } from 'posthog-js/react' import type { DesktopChatActivity } from '@/lib/api/contracts/desktop-executor' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { canViewWorkspaceBillingSettings } from '@/lib/billing/workspace-permissions' import { focusVisibleBrowserOmnibox } from '@/lib/browser-agent/renderer-shortcuts' import { useDeploymentShape } from '@/lib/core/config/deployment-shape' @@ -65,7 +65,7 @@ import { allNavigationItems, type SettingsSection, } from '@/app/workspace/[workspaceId]/settings/navigation' -import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils' +import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands' import { ChatNavigationLink, CollapsedChatFlyoutItem, diff --git a/apps/sim/app/workspace/layout.tsx b/apps/sim/app/workspace/layout.tsx index c81c00bac56..ead1ff22182 100644 --- a/apps/sim/app/workspace/layout.tsx +++ b/apps/sim/app/workspace/layout.tsx @@ -1,6 +1,6 @@ 'use client' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { SocketProvider } from '@/app/workspace/providers/socket-provider' interface WorkspaceRootLayoutProps { diff --git a/apps/sim/app/workspace/page.tsx b/apps/sim/app/workspace/page.tsx index bcaa5552339..5403128c1d2 100644 --- a/apps/sim/app/workspace/page.tsx +++ b/apps/sim/app/workspace/page.tsx @@ -9,7 +9,7 @@ import { isApiClientError } from '@/lib/api/client/errors' import { requestJson } from '@/lib/api/client/request' import { getWorkflowStateContract } from '@/lib/api/contracts/workflows' import { createWorkspaceContract } from '@/lib/api/contracts/workspaces' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { recoverFromStaleSession } from '@/lib/auth/stale-session-recovery' import { buildUpgradeHref, diff --git a/apps/sim/background/drain-governed-subject.test.ts b/apps/sim/background/drain-governed-subject.test.ts index 7d31f4abde4..015ab11a686 100644 --- a/apps/sim/background/drain-governed-subject.test.ts +++ b/apps/sim/background/drain-governed-subject.test.ts @@ -52,7 +52,7 @@ vi.mock('@/enrichments/run', () => ({ runEnrichment: hoisted.runEnrichment, skippedEnrichmentDetail: () => ({}), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) vi.mock('@/lib/table/rows/secret-provenance', () => tableRowsSecretProvenanceMock) vi.mock('@/lib/workflows/executor/execute-workflow', () => executeWorkflowMock) diff --git a/apps/sim/background/enrichment-capability-subject.test.ts b/apps/sim/background/enrichment-capability-subject.test.ts index 52aa7b0d978..aab5f966eef 100644 --- a/apps/sim/background/enrichment-capability-subject.test.ts +++ b/apps/sim/background/enrichment-capability-subject.test.ts @@ -43,7 +43,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@/lib/core/network/config.server', () => networkConfigMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/table/service', () => tableServiceMock) vi.mock('@/lib/table/rows/service', () => tableRowsServiceMock) @@ -62,7 +62,7 @@ vi.mock('@/enrichments/run', () => ({ runEnrichment: hoisted.runEnrichment, skippedEnrichmentDetail: hoisted.skippedEnrichmentDetail, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) vi.mock('@/lib/billing/core/usage-log', () => billingUsageLogMock) vi.mock('@/lib/table/rows/secret-provenance', () => tableRowsSecretProvenanceMock) diff --git a/apps/sim/background/knowledge-connector-directory-sync.ts b/apps/sim/background/knowledge-connector-directory-sync.ts index e067d6a620d..98fb3364af5 100644 --- a/apps/sim/background/knowledge-connector-directory-sync.ts +++ b/apps/sim/background/knowledge-connector-directory-sync.ts @@ -1,6 +1,5 @@ import { createLogger } from '@sim/logger' import { task } from '@trigger.dev/sdk' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' import { assertDirectorySyncPayload, DIRECTORY_SYNC_CONCURRENCY, @@ -8,6 +7,7 @@ import { DIRECTORY_SYNC_TASK_ID, type DirectorySyncPayload, } from '@/lib/knowledge/connectors/directory-queue' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { refreshConnectorDirectory } from '@/lib/knowledge/connectors/external-group-sync' const logger = createLogger('TriggerKnowledgeConnectorDirectorySync') diff --git a/apps/sim/background/knowledge-processing.test.ts b/apps/sim/background/knowledge-processing.test.ts index 48a621d24dc..4e017315e6c 100644 --- a/apps/sim/background/knowledge-processing.test.ts +++ b/apps/sim/background/knowledge-processing.test.ts @@ -15,7 +15,7 @@ import { DrizzleQueryError } from 'drizzle-orm/errors' import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/async-jobs/region', () => asyncJobsRegionMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/documents/service', () => knowledgeDocumentsServiceMock) import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' @@ -26,7 +26,7 @@ import { OcrRequestRejectedError, PermanentDocumentProcessingError, UsageLimitDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' +} from '@/lib/knowledge/documents/processing-error' import { MAX_PROVIDER_CONTINUATION_ATTEMPTS } from '@/lib/knowledge/documents/processing-provider-continuation' import { MAX_QUOTA_CONTINUATION_ATTEMPTS } from '@/lib/knowledge/documents/processing-quota-continuation' import type { DocumentProcessingAttemptContext } from '@/lib/knowledge/documents/service' diff --git a/apps/sim/background/knowledge-processing.ts b/apps/sim/background/knowledge-processing.ts index f31b04ba234..1d09c63fa65 100644 --- a/apps/sim/background/knowledge-processing.ts +++ b/apps/sim/background/knowledge-processing.ts @@ -15,12 +15,12 @@ import { isBYOKEmbeddingCredentialRejection, isEmbeddingQuotaExhaustion, } from '@/lib/embeddings' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { getOcrRequestRejection, isPermanentDocumentProcessingError, isUsageLimitDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' +} from '@/lib/knowledge/documents/processing-error' import { BACKFILL_PROCESSING_QUEUE_NAME, INTERACTIVE_PROCESSING_QUEUE_NAME, diff --git a/apps/sim/background/resume-execution.test.ts b/apps/sim/background/resume-execution.test.ts index fb2e2cc79b0..572046b551e 100644 --- a/apps/sim/background/resume-execution.test.ts +++ b/apps/sim/background/resume-execution.test.ts @@ -15,7 +15,7 @@ const { mockSnapshotFromJson, mockIsTimedOut } = vi.hoisted(() => ({ mockIsTimedOut: vi.fn(() => false), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/table/cascade-lock', () => ({ withCascadeLock: vi.fn() })) vi.mock('@/lib/table/deps', () => ({ isExecCancelled: vi.fn(() => false) })) diff --git a/apps/sim/background/resume-execution.ts b/apps/sim/background/resume-execution.ts index ee440c093a7..73f86e52988 100644 --- a/apps/sim/background/resume-execution.ts +++ b/apps/sim/background/resume-execution.ts @@ -6,7 +6,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, billingAttributionsEqual, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { capExecutionTimeoutMs, createTimeoutAbortController, diff --git a/apps/sim/background/resume-governed-subject.test.ts b/apps/sim/background/resume-governed-subject.test.ts index a689b1e78b0..89c72c72a92 100644 --- a/apps/sim/background/resume-governed-subject.test.ts +++ b/apps/sim/background/resume-governed-subject.test.ts @@ -26,7 +26,7 @@ const hoisted = vi.hoisted(() => ({ readStampedCapabilitySubject: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/table/cascade-lock', () => ({ withCascadeLock: hoisted.withCascadeLock })) vi.mock('@/lib/table/deps', () => ({ isExecCancelled: () => false })) vi.mock('@/lib/table/workflow-columns', () => tableWorkflowColumnsMock) diff --git a/apps/sim/background/schedule-execution.ts b/apps/sim/background/schedule-execution.ts index ace6772721b..02b0fdc003e 100644 --- a/apps/sim/background/schedule-execution.ts +++ b/apps/sim/background/schedule-execution.ts @@ -15,7 +15,7 @@ import { and, eq, isNull, ne, type SQL, sql } from 'drizzle-orm' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { classifyTransientAdmissionFailure } from '@/lib/core/admission/transient-failure' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts index 632185c7a9f..21854a4ddf5 100644 --- a/apps/sim/background/webhook-execution.ts +++ b/apps/sim/background/webhook-execution.ts @@ -21,7 +21,7 @@ import { import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { getJobQueue } from '@/lib/core/async-jobs' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { env, envNumber } from '@/lib/core/config/env' diff --git a/apps/sim/background/workflow-column-execution.ts b/apps/sim/background/workflow-column-execution.ts index 95751e02da0..6f7bc2b281c 100644 --- a/apps/sim/background/workflow-column-execution.ts +++ b/apps/sim/background/workflow-column-execution.ts @@ -11,7 +11,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { isRetryableInfrastructureError } from '@/lib/core/errors/retryable-infrastructure' diff --git a/apps/sim/background/workflow-execution.ts b/apps/sim/background/workflow-execution.ts index 145ab0970f0..36c7b034056 100644 --- a/apps/sim/background/workflow-execution.ts +++ b/apps/sim/background/workflow-execution.ts @@ -14,7 +14,7 @@ import { import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { logFailureOnce } from '@/lib/core/errors/failure-log' import { diff --git a/apps/sim/background/workflow-group-governed-subject.test.ts b/apps/sim/background/workflow-group-governed-subject.test.ts index afc9692f5ff..3e9af43acf7 100644 --- a/apps/sim/background/workflow-group-governed-subject.test.ts +++ b/apps/sim/background/workflow-group-governed-subject.test.ts @@ -89,7 +89,7 @@ vi.mock('@/executor/utils/resolved-secret-trace-registry', () => ({ exportCheckpointProvenance = vi.fn(() => undefined) }, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) /** Real pacing would sleep jittered backoff against the global db mock. */ vi.mock('@/lib/core/rate-limiter/rate-limiter', () => ({ diff --git a/apps/sim/blocks/agent-evaluation.test.ts b/apps/sim/blocks/agent-evaluation.test.ts index 620ed399274..f33edf56f6a 100644 --- a/apps/sim/blocks/agent-evaluation.test.ts +++ b/apps/sim/blocks/agent-evaluation.test.ts @@ -3,8 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { getEffectiveBlockOutputPaths, getEffectiveBlockOutputType, -} from '@/lib/workflows/blocks/block-outputs' -import { getBlockReferenceTags } from '@/lib/workflows/blocks/block-reference-tags' +} from '@/lib/workflows/blocks/outputs' +import { getBlockReferenceTags } from '@/lib/workflows/blocks/reference-tags' import { AgentBlock } from '@/blocks/blocks/agent' const { mockGetBlock } = vi.hoisted(() => ({ mockGetBlock: vi.fn() })) diff --git a/apps/sim/blocks/blocks/cloudflare.test.ts b/apps/sim/blocks/blocks/cloudflare.test.ts index 825715f54aa..320d41cb2dc 100644 --- a/apps/sim/blocks/blocks/cloudflare.test.ts +++ b/apps/sim/blocks/blocks/cloudflare.test.ts @@ -62,7 +62,7 @@ function modernBlockState(overrides: Record, advancedMode = fal /** * Mirror the executor merge — `finalInputs = { ...inputs, ...transformedParams }` - * in `executor/handlers/generic/generic-handler.ts` — so a key the mapper omits + * in `executor/handlers/generic/handler.ts` — so a key the mapper omits * keeps its raw block value and only an explicit `undefined` erases it. */ function mapParams(params: Record): Record { diff --git a/apps/sim/blocks/blocks/cloudflare.ts b/apps/sim/blocks/blocks/cloudflare.ts index 26a64e15065..395e972a021 100644 --- a/apps/sim/blocks/blocks/cloudflare.ts +++ b/apps/sim/blocks/blocks/cloudflare.ts @@ -2618,7 +2618,7 @@ Return ONLY the JSON array - no explanations, no markdown fences.`, /** * The executor merges this mapper's output over the raw inputs * (`finalInputs = { ...inputs, ...transformedParams }` in - * `executor/handlers/generic/generic-handler.ts`), so a key this mapper + * `executor/handlers/generic/handler.ts`), so a key this mapper * merely omits survives as its raw subBlock string. Every alias id must * therefore be assigned `undefined` rather than destructured away. */ diff --git a/apps/sim/blocks/blocks/file.ts b/apps/sim/blocks/blocks/file.ts index 3f43fb0039f..2d10d0222e8 100644 --- a/apps/sim/blocks/blocks/file.ts +++ b/apps/sim/blocks/blocks/file.ts @@ -7,7 +7,7 @@ import { ROOT_FOLDER_PATH, } from '@/lib/folders/paths' import { readFolderPaths } from '@/lib/folders/selection' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import type { BlockConfig, SubBlockType } from '@/blocks/types' import { IntegrationType } from '@/blocks/types' import { diff --git a/apps/sim/blocks/blocks/fireflies.ts b/apps/sim/blocks/blocks/fireflies.ts index d40f3c1520f..70240be5b1f 100644 --- a/apps/sim/blocks/blocks/fireflies.ts +++ b/apps/sim/blocks/blocks/fireflies.ts @@ -1,6 +1,6 @@ import { omit } from '@sim/utils/object' import { FirefliesIcon } from '@/components/icons' -import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file-utils' +import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file' import type { BlockConfig, BlockMeta } from '@/blocks/types' import { AuthMode, IntegrationType } from '@/blocks/types' import { normalizeFileInput } from '@/blocks/utils' diff --git a/apps/sim/blocks/blocks/function.ts b/apps/sim/blocks/blocks/function.ts index d15fe635fae..02edb197edf 100644 --- a/apps/sim/blocks/blocks/function.ts +++ b/apps/sim/blocks/blocks/function.ts @@ -1,7 +1,7 @@ import { CodeIcon } from '@/components/icons' import { getDeploymentShape } from '@/lib/core/config/deployment-shape' import { CodeLanguage, getLanguageDisplayName } from '@/lib/execution/languages' -import { SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/paths' import type { BlockConfig } from '@/blocks/types' export const FunctionBlock: BlockConfig = { diff --git a/apps/sim/blocks/blocks/github.ts b/apps/sim/blocks/blocks/github.ts index b94a93a7eb5..447299d3fee 100644 --- a/apps/sim/blocks/blocks/github.ts +++ b/apps/sim/blocks/blocks/github.ts @@ -2283,7 +2283,7 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`, * or `'false'` is not mistaken for an unset field; only nullish and empty * defer to the tool's own default. * - * `generic-handler.ts` merges `{ ...inputs, ...params(inputs) }` and + * `generic/handler.ts` merges `{ ...inputs, ...params(inputs) }` and * `providers/utils.ts` installs this as the provider `paramsTransform`, * spreading over the model's tool-call arguments — so emitting a key the * block did not supply would clobber a model-supplied value on the agent diff --git a/apps/sim/blocks/blocks/google_slides.ts b/apps/sim/blocks/blocks/google_slides.ts index 1f667b6cea5..6df71191c55 100644 --- a/apps/sim/blocks/blocks/google_slides.ts +++ b/apps/sim/blocks/blocks/google_slides.ts @@ -1,7 +1,7 @@ import { omit } from '@sim/utils/object' import { GoogleSlidesIcon } from '@/components/icons' import { getScopesForService } from '@/lib/oauth/utils' -import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file-utils' +import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file' import type { BlockConfig, BlockMeta } from '@/blocks/types' import { AuthMode, IntegrationType } from '@/blocks/types' import { normalizeFileInput, SERVICE_ACCOUNT_SUBBLOCKS } from '@/blocks/utils' diff --git a/apps/sim/blocks/blocks/telegram.ts b/apps/sim/blocks/blocks/telegram.ts index b365d376d55..e9deb554fa5 100644 --- a/apps/sim/blocks/blocks/telegram.ts +++ b/apps/sim/blocks/blocks/telegram.ts @@ -1,5 +1,5 @@ import { TelegramIcon } from '@/components/icons' -import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file-utils' +import { resolveHttpsUrlFromFileInput } from '@/lib/uploads/utils/file' import type { BlockConfig, BlockMeta } from '@/blocks/types' import { AuthMode, IntegrationType } from '@/blocks/types' import { normalizeFileInput } from '@/blocks/utils' diff --git a/apps/sim/blocks/blocks/zoho-desk.ts b/apps/sim/blocks/blocks/zoho-desk.ts index 3906ad75334..931375d638a 100644 --- a/apps/sim/blocks/blocks/zoho-desk.ts +++ b/apps/sim/blocks/blocks/zoho-desk.ts @@ -595,7 +595,7 @@ export const ZohoDeskBlock: BlockConfig = { // IMPORTANT: destructuring a key out of `rest` does NOT keep it from the // tool. Both call sites merge this function's return value on top of the // original inputs (`{ ...inputs, ...transformedParams }` in - // executor/handlers/generic/generic-handler.ts, and the same shape in + // executor/handlers/generic/handler.ts, and the same shape in // providers/utils.ts), so a key left out of `result` is simply restored // from `inputs`. The only way to scope a param to an operation is to // OVERWRITE it with `undefined`, which every tool then treats as unset. diff --git a/apps/sim/components/agent-stream/agent-stream-chrome.tsx b/apps/sim/components/agent-stream/agent-stream-chrome.tsx index ed91d7d1ae1..97395ff7c02 100644 --- a/apps/sim/components/agent-stream/agent-stream-chrome.tsx +++ b/apps/sim/components/agent-stream/agent-stream-chrome.tsx @@ -8,7 +8,7 @@ import type { AgentStreamToolStatus, } from '@/components/agent-stream/tool-call-lifecycle' import { ShimmerText } from '@/components/ui' -import { humanizeToolName } from '@/lib/mothership/tools/tool-display' +import { humanizeToolName } from '@/lib/mothership/tools/display' /** Distance from bottom (px) within which we keep following new thinking text. */ const STICK_TO_BOTTOM_THRESHOLD_PX = 24 diff --git a/apps/sim/components/agent-stream/tool-call-lifecycle.ts b/apps/sim/components/agent-stream/tool-call-lifecycle.ts index 5a78bb1b1c0..b9b63315fbb 100644 --- a/apps/sim/components/agent-stream/tool-call-lifecycle.ts +++ b/apps/sim/components/agent-stream/tool-call-lifecycle.ts @@ -7,7 +7,7 @@ * implementation so the three surfaces cannot drift. */ -import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display' +import { getToolDisplayTitle } from '@/lib/mothership/tools/display' export type AgentStreamToolStatus = 'running' | 'success' | 'error' | 'cancelled' diff --git a/apps/sim/components/dashboards/dashboard-interactions.tsx b/apps/sim/components/dashboards/dashboard-interactions.tsx index 8dacd53a7b4..696518c0720 100644 --- a/apps/sim/components/dashboards/dashboard-interactions.tsx +++ b/apps/sim/components/dashboards/dashboard-interactions.tsx @@ -2,7 +2,7 @@ import { createContext, useContext } from 'react' import type { DashboardTimeRange } from '@/lib/dashboards/time' -import type { DashboardCursorStore } from '@/stores/dashboards/cursor' +import type { DashboardCursorStore } from '@/stores/dashboards/cursor/store' interface DashboardInteractions { cursorStore: DashboardCursorStore diff --git a/apps/sim/components/dashboards/dashboard-panel.test.tsx b/apps/sim/components/dashboards/dashboard-panel.test.tsx index 07cfdf3a2e1..bd95435c3bc 100644 --- a/apps/sim/components/dashboards/dashboard-panel.test.tsx +++ b/apps/sim/components/dashboards/dashboard-panel.test.tsx @@ -5,7 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { DashboardInteractionContext } from '@/components/dashboards/dashboard-interactions' import { DashboardPanel } from '@/components/dashboards/dashboard-panel' import type { QueryTableAnalyticsResponse } from '@/lib/api/contracts/table-analytics' -import { createDashboardCursorStore } from '@/stores/dashboards/cursor' +import { createDashboardCursorStore } from '@/stores/dashboards/cursor/store' const mocks = vi.hoisted(() => ({ query: vi.fn() })) vi.mock('@/hooks/queries/table-analytics', () => ({ useTableAnalytics: mocks.query })) diff --git a/apps/sim/components/dashboards/use-dashboard-time.ts b/apps/sim/components/dashboards/use-dashboard-time.ts index f96b8ad0b3b..367861ed50b 100644 --- a/apps/sim/components/dashboards/use-dashboard-time.ts +++ b/apps/sim/components/dashboards/use-dashboard-time.ts @@ -13,7 +13,10 @@ import { relativeDashboardRange, } from '@/lib/dashboards/time' import { tableAnalyticsKeys } from '@/hooks/queries/table-analytics' -import { createDashboardCursorStore, type DashboardCursorStore } from '@/stores/dashboards/cursor' +import { + createDashboardCursorStore, + type DashboardCursorStore, +} from '@/stores/dashboards/cursor/store' /** How often a relative range advances its end to the present while the page is visible. */ const LIVE_TICK_MS = 60_000 diff --git a/apps/sim/components/settings/unsaved-changes-regression.test.tsx b/apps/sim/components/settings/unsaved-changes-regression.test.tsx index 072f3d6c759..2a4e5c168a6 100644 --- a/apps/sim/components/settings/unsaved-changes-regression.test.tsx +++ b/apps/sim/components/settings/unsaved-changes-regression.test.tsx @@ -53,7 +53,7 @@ vi.mock( 'next/navigation', async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock ) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) const credential: WorkspaceCredential = { id: 'credential-a', diff --git a/apps/sim/connectors/google-workspace/api-errors.test.ts b/apps/sim/connectors/google-workspace/api-errors.test.ts index 8097a78ef3b..54532f66285 100644 --- a/apps/sim/connectors/google-workspace/api-errors.test.ts +++ b/apps/sim/connectors/google-workspace/api-errors.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { fetchGoogleApiWithRetry, readGoogleApiError, diff --git a/apps/sim/ee/access-control/components/group-detail.test.tsx b/apps/sim/ee/access-control/components/group-detail.test.tsx index 31fec2fc633..6f8b7e91278 100644 --- a/apps/sim/ee/access-control/components/group-detail.test.tsx +++ b/apps/sim/ee/access-control/components/group-detail.test.tsx @@ -21,7 +21,7 @@ import { organizationKeys } from '@/hooks/queries/utils/organization-keys' import { permissionGroupKeys } from '@/hooks/queries/utils/permission-group-keys' import { useSettingsDirtyStore } from '@/stores/settings/dirty/store' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('next/navigation', () => nextNavigationMock) vi.mock('@/providers/models', () => providersModelsMock) vi.mock('@/providers/utils', () => providersUtilsMock) diff --git a/apps/sim/ee/custom-blocks/components/custom-block-detail.test.tsx b/apps/sim/ee/custom-blocks/components/custom-block-detail.test.tsx index 4b5a7b02990..067169c9c44 100644 --- a/apps/sim/ee/custom-blocks/components/custom-block-detail.test.tsx +++ b/apps/sim/ee/custom-blocks/components/custom-block-detail.test.tsx @@ -22,7 +22,7 @@ import { workflowKeys } from '@/hooks/queries/utils/workflow-keys' import { workspaceKeys } from '@/hooks/queries/workspace' import { useSettingsDirtyStore } from '@/stores/settings/dirty/store' -vi.mock('@/lib/workflows/blocks/block-outputs', () => ({ +vi.mock('@/lib/workflows/blocks/outputs', () => ({ getEffectiveBlockOutputs: () => ({ response: { type: 'string' } }), })) diff --git a/apps/sim/ee/data-drains/components/data-drain-detail.tsx b/apps/sim/ee/data-drains/components/data-drain-detail.tsx index 2be2cd4ca35..1ecc8697f2b 100644 --- a/apps/sim/ee/data-drains/components/data-drain-detail.tsx +++ b/apps/sim/ee/data-drains/components/data-drain-detail.tsx @@ -5,7 +5,7 @@ import { Badge, ChipConfirmModal, Label, Switch, toast } from '@sim/emcn' import { ArrowLeft, Database } from '@sim/emcn/icons' import { toError } from '@sim/utils/errors' import type { DataDrain, DataDrainRun } from '@/lib/api/contracts/data-drains' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' import { CredentialDetailHeading } from '@/app/workspace/[workspaceId]/components/credential-detail' import { ResourceTile } from '@/app/workspace/[workspaceId]/components/resource-tile' import { SettingsEmptyState } from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state' diff --git a/apps/sim/ee/sso/components/sso-form.test.tsx b/apps/sim/ee/sso/components/sso-form.test.tsx index 54e7e7537d3..b9c833c56e5 100644 --- a/apps/sim/ee/sso/components/sso-form.test.tsx +++ b/apps/sim/ee/sso/components/sso-form.test.tsx @@ -30,7 +30,7 @@ vi.mock('@sim/emcn', () => ({ cn: (...values: unknown[]) => values.filter(Boolean).join(' '), })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/(auth)/components', () => ({ AuthFormMessage: ({ children }: { children?: ReactNode }) =>
{children}
, diff --git a/apps/sim/ee/sso/components/sso-form.tsx b/apps/sim/ee/sso/components/sso-form.tsx index aa81e5a8ddd..86e6c88efb0 100644 --- a/apps/sim/ee/sso/components/sso-form.tsx +++ b/apps/sim/ee/sso/components/sso-form.tsx @@ -8,7 +8,7 @@ import { useSearchParams } from 'next/navigation' import { isApiClientError } from '@/lib/api/client/errors' import { requestJson } from '@/lib/api/client/request' import { resolveSsoProviderContract } from '@/lib/api/contracts/auth' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { getEnv, isFalsy } from '@/lib/core/config/env' import { validateCallbackUrl } from '@/lib/core/security/input-validation' import { quickValidateEmail } from '@/lib/messaging/email/validation' diff --git a/apps/sim/ee/sso/components/sso-settings.test.tsx b/apps/sim/ee/sso/components/sso-settings.test.tsx index 0073a562ca6..7aa6f5aa2d3 100644 --- a/apps/sim/ee/sso/components/sso-settings.test.tsx +++ b/apps/sim/ee/sso/components/sso-settings.test.tsx @@ -135,7 +135,7 @@ vi.mock('@sim/emcn', () => ({ }, })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/app/workspace/[workspaceId]/components/credential-detail', () => ({ UnsavedChangesModal: () => null, diff --git a/apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts b/apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts index 10064d0d842..18c4a9a4504 100644 --- a/apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts +++ b/apps/sim/ee/workspace-forking/lib/copy/copy-files.test.ts @@ -72,9 +72,9 @@ const { fileRows, allocateFromFileRows } = vi.hoisted(() => { vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock('@/lib/billing/storage', () => billingStorageMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/ee/workspace-forking/lib/copy/copy-files.ts b/apps/sim/ee/workspace-forking/lib/copy/copy-files.ts index b5bd5c41592..9a17cccd52b 100644 --- a/apps/sim/ee/workspace-forking/lib/copy/copy-files.ts +++ b/apps/sim/ee/workspace-forking/lib/copy/copy-files.ts @@ -13,8 +13,8 @@ import type { DbOrTx } from '@/lib/db/types' import { allocateUniqueWorkspaceFileName, generateWorkspaceFileKey, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { copyWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { copyWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFile, downloadFile, diff --git a/apps/sim/ee/workspace-forking/lib/create-fork.test.ts b/apps/sim/ee/workspace-forking/lib/create-fork.test.ts index 7baa904052a..3c38e962f83 100644 --- a/apps/sim/ee/workspace-forking/lib/create-fork.test.ts +++ b/apps/sim/ee/workspace-forking/lib/create-fork.test.ts @@ -96,7 +96,7 @@ vi.mock('@/ee/workspace-forking/lib/remap/fork-bootstrap', () => ({ createForkBootstrapTransform: vi.fn(() => (subBlocks: unknown) => subBlocks), createForkBlockTypeTransform: vi.fn(() => (blockType: string) => blockType), })) -vi.mock('@/lib/workflows/references/reference-scan', () => ({ +vi.mock('@/lib/workflows/references/scan', () => ({ collectReferencedDocumentIds: vi.fn(() => new Set()), collectReferencedFileFolderPaths: mockCollectReferencedFileFolderPaths, })) diff --git a/apps/sim/ee/workspace-forking/lib/create-fork.ts b/apps/sim/ee/workspace-forking/lib/create-fork.ts index bcbcbfa2814..3944e1b3d0b 100644 --- a/apps/sim/ee/workspace-forking/lib/create-fork.ts +++ b/apps/sim/ee/workspace-forking/lib/create-fork.ts @@ -11,11 +11,11 @@ import { requireForkProject } from '@/lib/projects/membership' import { buildDefaultWorkflowArtifacts } from '@/lib/workflows/defaults' import { insertNewWorkflowRow } from '@/lib/workflows/persistence/new-workflow-row' import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils' +import type { ForkRemapKind } from '@/lib/workflows/references/remap-references' import { collectReferencedDocumentIds, collectReferencedFileFolderPaths, -} from '@/lib/workflows/references/reference-scan' -import type { ForkRemapKind } from '@/lib/workflows/references/remap-references' +} from '@/lib/workflows/references/scan' import { WORKSPACE_OPERATION_OBSERVE_EVENT } from '@/lib/workspaces/operations/outbox-events' import { findWorkspaceOperationReceipt, diff --git a/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.test.ts b/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.test.ts index ca0fc08d3a7..0e59407a54b 100644 --- a/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.test.ts +++ b/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.test.ts @@ -48,7 +48,7 @@ vi.mock('@/lib/workflows/references/remap-references', () => ({ scanWorkflowReferences: mockScanWorkflowReferences, })) -vi.mock('@/lib/workflows/references/reference-scan', () => ({ +vi.mock('@/lib/workflows/references/scan', () => ({ toScannerBlocks: vi.fn((state: unknown) => state), })) diff --git a/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.ts b/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.ts index 89dd63725aa..69e66410736 100644 --- a/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.ts +++ b/apps/sim/ee/workspace-forking/lib/mapping/mapping-service.ts @@ -3,7 +3,6 @@ import { workflow } from '@sim/db/schema' import { and, eq, isNull } from 'drizzle-orm' import type { ForkMappableResourceType, ForkMappingEntry } from '@/lib/api/contracts/workspace-fork' import type { DbOrTx } from '@/lib/db/types' -import { toScannerBlocks } from '@/lib/workflows/references/reference-scan' import { type ForkReference, type ForkRemapKind, @@ -19,6 +18,7 @@ import { listForkResourceCandidates, loadForkResourceLabels, } from '@/lib/workflows/references/resources' +import { toScannerBlocks } from '@/lib/workflows/references/scan' import { listDeployedWorkflows, readDeployedState, diff --git a/apps/sim/ee/workspace-forking/lib/promote/promote-plan.ts b/apps/sim/ee/workspace-forking/lib/promote/promote-plan.ts index b2237c1057f..f51379f14a6 100644 --- a/apps/sim/ee/workspace-forking/lib/promote/promote-plan.ts +++ b/apps/sim/ee/workspace-forking/lib/promote/promote-plan.ts @@ -3,7 +3,6 @@ import { generateId } from '@sim/utils/id' import { and, eq, isNull } from 'drizzle-orm' import { type ForkCopyableKind, forkCopyableKindSchema } from '@/lib/api/contracts/workspace-fork' import type { DbOrTx } from '@/lib/db/types' -import { toScannerBlocks } from '@/lib/workflows/references/reference-scan' import { type ForkReference, type ForkReferenceResolver, @@ -18,6 +17,7 @@ import { listForkCopyableSourceResources, loadForkCopyableResourceLabels, } from '@/lib/workflows/references/resources' +import { toScannerBlocks } from '@/lib/workflows/references/scan' import type { DeployedWorkflowSummary } from '@/ee/workspace-forking/lib/copy/deploy-bridge' import type { ForkEdge } from '@/ee/workspace-forking/lib/lineage/lineage' import { detectForkCascadeReferences } from '@/ee/workspace-forking/lib/mapping/cascade' diff --git a/apps/sim/executor/execution/types.ts b/apps/sim/executor/execution/types.ts index 9d3ecd33162..c5aa218d906 100644 --- a/apps/sim/executor/execution/types.ts +++ b/apps/sim/executor/execution/types.ts @@ -1,6 +1,6 @@ import type { WorkflowExecutionPrincipal } from '@sim/auth/principal' import type { Edge } from '@xyflow/react' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import type { CustomPiiPattern } from '@/lib/guardrails/pii-entities' import type { NodeMetadata } from '@/executor/dag/types' diff --git a/apps/sim/executor/handlers/agent/agent-handler.test.ts b/apps/sim/executor/handlers/agent/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/agent/agent-handler.test.ts rename to apps/sim/executor/handlers/agent/handler.test.ts index c23d3eab9f2..6d801c8e2bf 100644 --- a/apps/sim/executor/handlers/agent/agent-handler.test.ts +++ b/apps/sim/executor/handlers/agent/handler.test.ts @@ -35,7 +35,7 @@ import type { AgentTurnSession } from '@/lib/memory/agent-turn-session' import * as userFileBase64 from '@/lib/uploads/utils/user-file-base64.server' import { getAllBlocks, getBlock } from '@/blocks' import { AGENT, BlockType } from '@/executor/constants' -import { AgentBlockHandler } from '@/executor/handlers/agent/agent-handler' +import { AgentBlockHandler } from '@/executor/handlers/agent/handler' import * as agentMemory from '@/executor/handlers/agent/memory' import type { AgentInputs, Message } from '@/executor/handlers/agent/types' import type { ExecutionContext, StreamingExecution } from '@/executor/types' @@ -86,7 +86,7 @@ vi.mock('@/lib/internal/mcp/discover-tools', () => ({ vi.mock('@/ee/access-control/utils/permission-check', () => permissionCheckMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/executor/handlers/agent/agent-handler.ts b/apps/sim/executor/handlers/agent/handler.ts similarity index 99% rename from apps/sim/executor/handlers/agent/agent-handler.ts rename to apps/sim/executor/handlers/agent/handler.ts index 63732de0db1..b04cecd2721 100644 --- a/apps/sim/executor/handlers/agent/agent-handler.ts +++ b/apps/sim/executor/handlers/agent/handler.ts @@ -31,14 +31,14 @@ import { resolveAutoModel, SIM_AUTO_SYSTEM_PREAMBLE, } from '@/lib/model-router/resolve' -import { importWorkspaceFileSecretProvenanceForModelView } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { importWorkspaceFileSecretProvenanceForModelView } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { getFileExtension, MODEL_SUPPORTED_IMAGE_MIME_TYPES, processFilesToUserFiles, type RawFileInput, tryInferContextFromKey, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { appendUnavailableAttachmentNotice, selectModelBoundFileInputPaths, diff --git a/apps/sim/executor/handlers/agent/memory-harness.integration.ts b/apps/sim/executor/handlers/agent/memory-harness.integration.ts index 73808054aa4..af2b350d8a7 100644 --- a/apps/sim/executor/handlers/agent/memory-harness.integration.ts +++ b/apps/sim/executor/handlers/agent/memory-harness.integration.ts @@ -75,15 +75,15 @@ import { } from '@sim/db/schema' import { hashDurableSecretProvenanceValue } from '@/lib/execution/durable-secret-provenance' import { StorageService } from '@/lib/uploads' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE, initializeWorkspaceFileSecretProvenanceInTx, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFile, uploadFile } from '@/lib/uploads/core/storage-service' import { insertImmutableFileMetadata } from '@/lib/uploads/server/metadata' import { readWorkspaceFileRecordByKey } from '@/lib/workspace-files/application/read-workspace-file-content-by-key' -import { AgentBlockHandler } from '@/executor/handlers/agent/agent-handler' +import { AgentBlockHandler } from '@/executor/handlers/agent/handler' import type { AgentInputs, Message } from '@/executor/handlers/agent/types' import type { ExecutionContext, StreamingExecution, UserFile } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/executor/handlers/api/api-handler.test.ts b/apps/sim/executor/handlers/api/handler.test.ts similarity index 98% rename from apps/sim/executor/handlers/api/api-handler.test.ts rename to apps/sim/executor/handlers/api/handler.test.ts index f7096fb5e61..a53ad1fb459 100644 --- a/apps/sim/executor/handlers/api/api-handler.test.ts +++ b/apps/sim/executor/handlers/api/handler.test.ts @@ -3,7 +3,7 @@ import '@sim/testing/mocks/executor' import { inputValidationMock, inputValidationMockFns } from '@sim/testing' import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest' import { BlockType } from '@/executor/constants' -import { ApiBlockHandler } from '@/executor/handlers/api/api-handler' +import { ApiBlockHandler } from '@/executor/handlers/api/handler' import type { ExecutionContext } from '@/executor/types' import type { SerializedBlock } from '@/serializer/types' import { executeTool } from '@/tools' diff --git a/apps/sim/executor/handlers/api/api-handler.ts b/apps/sim/executor/handlers/api/handler.ts similarity index 100% rename from apps/sim/executor/handlers/api/api-handler.ts rename to apps/sim/executor/handlers/api/handler.ts diff --git a/apps/sim/executor/handlers/condition/condition-handler.test.ts b/apps/sim/executor/handlers/condition/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/condition/condition-handler.test.ts rename to apps/sim/executor/handlers/condition/handler.test.ts index 5b94100eaec..f5e150182b6 100644 --- a/apps/sim/executor/handlers/condition/condition-handler.test.ts +++ b/apps/sim/executor/handlers/condition/handler.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { BlockType } from '@/executor/constants' import { DAGBuilder } from '@/executor/dag/builder' import { EdgeManager } from '@/executor/execution/edge-manager' -import { ConditionBlockHandler } from '@/executor/handlers/condition/condition-handler' +import { ConditionBlockHandler } from '@/executor/handlers/condition/handler' import type { BlockState, ExecutionContext, NormalizedBlockOutput } from '@/executor/types' import { buildBranchNodeId, diff --git a/apps/sim/executor/handlers/condition/condition-handler.ts b/apps/sim/executor/handlers/condition/handler.ts similarity index 100% rename from apps/sim/executor/handlers/condition/condition-handler.ts rename to apps/sim/executor/handlers/condition/handler.ts diff --git a/apps/sim/executor/handlers/credential-group/credential-group-handler.test.ts b/apps/sim/executor/handlers/credential-group/handler.test.ts similarity index 90% rename from apps/sim/executor/handlers/credential-group/credential-group-handler.test.ts rename to apps/sim/executor/handlers/credential-group/handler.test.ts index 638a10a72fe..a5a8d228284 100644 --- a/apps/sim/executor/handlers/credential-group/credential-group-handler.test.ts +++ b/apps/sim/executor/handlers/credential-group/handler.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { CredentialGroupBlockHandler } from '@/executor/handlers/credential-group/credential-group-handler' +import { CredentialGroupBlockHandler } from '@/executor/handlers/credential-group/handler' describe('legacy Connected Accounts block', () => { it('requires explicit replacement instead of changing credential scope silently', async () => { diff --git a/apps/sim/executor/handlers/credential-group/credential-group-handler.ts b/apps/sim/executor/handlers/credential-group/handler.ts similarity index 100% rename from apps/sim/executor/handlers/credential-group/credential-group-handler.ts rename to apps/sim/executor/handlers/credential-group/handler.ts diff --git a/apps/sim/executor/handlers/credential/credential-handler.test.ts b/apps/sim/executor/handlers/credential/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/credential/credential-handler.test.ts rename to apps/sim/executor/handlers/credential/handler.test.ts index 379a8a11902..73de1816055 100644 --- a/apps/sim/executor/handlers/credential/credential-handler.test.ts +++ b/apps/sim/executor/handlers/credential/handler.test.ts @@ -22,7 +22,7 @@ vi.mock('@/lib/credentials/application/resolve-workflow-credentials', () => ({ resolveWorkflowCredentials: { execute: hoisted.workspace }, })) -import { CredentialBlockHandler } from '@/executor/handlers/credential/credential-handler' +import { CredentialBlockHandler } from '@/executor/handlers/credential/handler' const mocks = { ...hoisted, diff --git a/apps/sim/executor/handlers/credential/credential-handler.ts b/apps/sim/executor/handlers/credential/handler.ts similarity index 100% rename from apps/sim/executor/handlers/credential/credential-handler.ts rename to apps/sim/executor/handlers/credential/handler.ts diff --git a/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts b/apps/sim/executor/handlers/evaluator/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts rename to apps/sim/executor/handlers/evaluator/handler.test.ts index c183fe9eb01..c181b4c1248 100644 --- a/apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts +++ b/apps/sim/executor/handlers/evaluator/handler.test.ts @@ -30,7 +30,7 @@ vi.mock('@/lib/model-router/resolve', () => ({ })) import { BlockType } from '@/executor/constants' -import { EvaluatorBlockHandler } from '@/executor/handlers/evaluator/evaluator-handler' +import { EvaluatorBlockHandler } from '@/executor/handlers/evaluator/handler' import type { ExecutionContext } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' import { executeProviderRequest } from '@/providers' diff --git a/apps/sim/executor/handlers/evaluator/evaluator-handler.ts b/apps/sim/executor/handlers/evaluator/handler.ts similarity index 100% rename from apps/sim/executor/handlers/evaluator/evaluator-handler.ts rename to apps/sim/executor/handlers/evaluator/handler.ts diff --git a/apps/sim/executor/handlers/function/function-handler.test.ts b/apps/sim/executor/handlers/function/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/function/function-handler.test.ts rename to apps/sim/executor/handlers/function/handler.test.ts index 4dfdf6b849a..4b3296a5d49 100644 --- a/apps/sim/executor/handlers/function/function-handler.test.ts +++ b/apps/sim/executor/handlers/function/handler.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest' import { createTimeoutAbortController } from '@/lib/core/execution-limits' import { NonRetryableExecutionError } from '@/lib/execution/non-retryable-error' import { BlockType } from '@/executor/constants' -import { FunctionBlockHandler } from '@/executor/handlers/function/function-handler' +import { FunctionBlockHandler } from '@/executor/handlers/function/handler' import type { ExecutionContext } from '@/executor/types' import { readTrustedExecutionCost } from '@/executor/utils/errors' import type { SerializedBlock } from '@/serializer/types' diff --git a/apps/sim/executor/handlers/function/function-handler.ts b/apps/sim/executor/handlers/function/handler.ts similarity index 100% rename from apps/sim/executor/handlers/function/function-handler.ts rename to apps/sim/executor/handlers/function/handler.ts diff --git a/apps/sim/executor/handlers/generic/file-write.test.ts b/apps/sim/executor/handlers/generic/file-write.test.ts index b6765eb0a54..c1fb78a50d0 100644 --- a/apps/sim/executor/handlers/generic/file-write.test.ts +++ b/apps/sim/executor/handlers/generic/file-write.test.ts @@ -5,7 +5,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { fileManageWriteBodySchema } from '@/lib/api/contracts/tools/file' import { FileV5Block } from '@/blocks/blocks/file' import { getBlock } from '@/blocks/index' -import { GenericBlockHandler } from '@/executor/handlers/generic/generic-handler' +import { GenericBlockHandler } from '@/executor/handlers/generic/handler' import { executeTool } from '@/tools' import { fileWriteTool } from '@/tools/file/write' import { getTool } from '@/tools/utils' diff --git a/apps/sim/executor/handlers/generic/generic-handler.test.ts b/apps/sim/executor/handlers/generic/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/generic/generic-handler.test.ts rename to apps/sim/executor/handlers/generic/handler.test.ts index ab5bdfda5aa..a78fdf237d0 100644 --- a/apps/sim/executor/handlers/generic/generic-handler.test.ts +++ b/apps/sim/executor/handlers/generic/handler.test.ts @@ -6,7 +6,7 @@ import { BufferBlock } from '@/blocks/blocks/buffer' import { HarmonicBlock } from '@/blocks/blocks/harmonic' import { McpBlock } from '@/blocks/blocks/mcp' import { getBlock } from '@/blocks/index' -import { GenericBlockHandler } from '@/executor/handlers/generic/generic-handler' +import { GenericBlockHandler } from '@/executor/handlers/generic/handler' import type { ExecutionContext } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' import type { SerializedBlock } from '@/serializer/types' diff --git a/apps/sim/executor/handlers/generic/generic-handler.ts b/apps/sim/executor/handlers/generic/handler.ts similarity index 100% rename from apps/sim/executor/handlers/generic/generic-handler.ts rename to apps/sim/executor/handlers/generic/handler.ts diff --git a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts b/apps/sim/executor/handlers/human-in-the-loop/handler.ts similarity index 100% rename from apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts rename to apps/sim/executor/handlers/human-in-the-loop/handler.ts diff --git a/apps/sim/executor/handlers/human-in-the-loop/notification-params.test.ts b/apps/sim/executor/handlers/human-in-the-loop/notification-params.test.ts index 3ba892abad5..dc4bd9d32a4 100644 --- a/apps/sim/executor/handlers/human-in-the-loop/notification-params.test.ts +++ b/apps/sim/executor/handlers/human-in-the-loop/notification-params.test.ts @@ -33,7 +33,7 @@ vi.mock('@/tools', () => toolsMock) import { getBlock } from '@/blocks/registry' import { PAUSE_RESUME } from '@/executor/constants' -import { HumanInTheLoopBlockHandler } from '@/executor/handlers/human-in-the-loop/human-in-the-loop-handler' +import { HumanInTheLoopBlockHandler } from '@/executor/handlers/human-in-the-loop/handler' toolsUtilsMockFns.mockGetTool.mockReturnValue({ id: 'notifier_send', diff --git a/apps/sim/executor/handlers/mothership/mothership-handler.test.ts b/apps/sim/executor/handlers/mothership/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/mothership/mothership-handler.test.ts rename to apps/sim/executor/handlers/mothership/handler.test.ts index 9b4c5bed361..9b4914035c6 100644 --- a/apps/sim/executor/handlers/mothership/mothership-handler.test.ts +++ b/apps/sim/executor/handlers/mothership/handler.test.ts @@ -11,7 +11,7 @@ import { resetEnvMock, setEnv } from '@sim/testing' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { resolveMothershipConversation } from '@/lib/mothership/conversation-id' import { BlockType } from '@/executor/constants' -import { MothershipBlockHandler } from '@/executor/handlers/mothership/mothership-handler' +import { MothershipBlockHandler } from '@/executor/handlers/mothership/handler' import type { ExecutionContext, StreamingExecution } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' import { createAgentStreamPump } from '@/providers/stream-pump' @@ -61,7 +61,7 @@ const { vi.mock('@/lib/auth/internal', () => authInternalMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/executor/handlers/mothership/mothership-handler.ts b/apps/sim/executor/handlers/mothership/handler.ts similarity index 99% rename from apps/sim/executor/handlers/mothership/mothership-handler.ts rename to apps/sim/executor/handlers/mothership/handler.ts index 2e0a5c8ecac..6c2cd963afc 100644 --- a/apps/sim/executor/handlers/mothership/mothership-handler.ts +++ b/apps/sim/executor/handlers/mothership/handler.ts @@ -9,7 +9,7 @@ import { generateInternalDelegationToken } from '@/lib/auth/internal' import { BILLING_ATTRIBUTION_HEADER, serializeBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { projectModelSchemaAnnotations, @@ -34,13 +34,13 @@ import { normalizeSecretMountPolicy } from '@/lib/mothership/secret-mount-policy import { areModelSafeWorkspaceFileKeys, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { createFileContentFromBase64, type MessageContent, processSingleFileToUserFile, type RawFileInput, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { selectModelBoundFileInputPaths } from '@/lib/uploads/utils/model-input' import { resolveAgentToolUsageControl } from '@/lib/workflows/tool-input/usage-control' import type { BlockOutput } from '@/blocks/types' diff --git a/apps/sim/executor/handlers/pi/cloud/review/backend.test.ts b/apps/sim/executor/handlers/pi/cloud/review/backend.test.ts index 1a9c63757fe..90802d937f5 100644 --- a/apps/sim/executor/handlers/pi/cloud/review/backend.test.ts +++ b/apps/sim/executor/handlers/pi/cloud/review/backend.test.ts @@ -76,8 +76,8 @@ vi.mock('@/executor/handlers/pi/cloud/review/tools', () => ({ createCloudReviewTools: mockCreateTools, })) // `toPiTool` stays real so the search tool's scrubbing boundary is the one shipped, not a stub. -vi.mock('@/executor/handlers/pi/core/pi-sdk', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/executor/handlers/pi/core/sdk', async (importOriginal) => ({ + ...(await importOriginal()), loadPiSdk: () => Promise.resolve(mockSdk), createPiModelRuntime: mockCreatePiModelRuntime, resolvePiSdkModel: () => ({ id: 'claude', provider: 'anthropic' }), diff --git a/apps/sim/executor/handlers/pi/cloud/review/backend.ts b/apps/sim/executor/handlers/pi/cloud/review/backend.ts index 83263157fdb..5534d475133 100644 --- a/apps/sim/executor/handlers/pi/cloud/review/backend.ts +++ b/apps/sim/executor/handlers/pi/cloud/review/backend.ts @@ -37,18 +37,18 @@ import type { PiBackendRun, PiCloudReviewRunParams } from '@/executor/handlers/p import { buildPiPrompt } from '@/executor/handlers/pi/core/context' import { applyPiEvent, createPiTotals, normalizePiEvent } from '@/executor/handlers/pi/core/events' import { mapThinkingLevel } from '@/executor/handlers/pi/core/keys' +import { + createScrubbedPiError, + getScrubbedPiErrorMessage, + scrubPiEvent, +} from '@/executor/handlers/pi/core/redaction' import { createPiModelRuntime, createSealedPiResourceLoader, loadPiSdk, resolvePiSdkModel, toPiTool, -} from '@/executor/handlers/pi/core/pi-sdk' -import { - createScrubbedPiError, - getScrubbedPiErrorMessage, - scrubPiEvent, -} from '@/executor/handlers/pi/core/redaction' +} from '@/executor/handlers/pi/core/sdk' import { PI_SEARCH_TOOL_NAME, PI_SEARCH_UNTRUSTED_SENTENCE, diff --git a/apps/sim/executor/handlers/pi/cloud/review/tools.ts b/apps/sim/executor/handlers/pi/cloud/review/tools.ts index 6dfbc4f2954..f2949d46409 100644 --- a/apps/sim/executor/handlers/pi/cloud/review/tools.ts +++ b/apps/sim/executor/handlers/pi/cloud/review/tools.ts @@ -3,8 +3,8 @@ import { Type } from 'typebox' import type { PiSandboxRunner } from '@/lib/execution/remote-sandbox' import { REVIEW_TOOLS_SCRIPT } from '@/executor/handlers/pi/cloud/review/tools-script' import { raceAbort } from '@/executor/handlers/pi/cloud/shared' -import type { PiSdk } from '@/executor/handlers/pi/core/pi-sdk' import { scrubPiSecrets } from '@/executor/handlers/pi/core/redaction' +import type { PiSdk } from '@/executor/handlers/pi/core/sdk' import { parseReviewFindings, type ReviewFindings, diff --git a/apps/sim/executor/handlers/pi/core/pi-sdk.test.ts b/apps/sim/executor/handlers/pi/core/sdk.test.ts similarity index 91% rename from apps/sim/executor/handlers/pi/core/pi-sdk.test.ts rename to apps/sim/executor/handlers/pi/core/sdk.test.ts index f171dd94a86..de684f873cf 100644 --- a/apps/sim/executor/handlers/pi/core/pi-sdk.test.ts +++ b/apps/sim/executor/handlers/pi/core/sdk.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { PiSdk } from '@/executor/handlers/pi/core/pi-sdk' -import { createSealedPiResourceLoader } from '@/executor/handlers/pi/core/pi-sdk' +import type { PiSdk } from '@/executor/handlers/pi/core/sdk' +import { createSealedPiResourceLoader } from '@/executor/handlers/pi/core/sdk' describe('createSealedPiResourceLoader', () => { it('exposes no discovered prompt sources or repository resources', async () => { diff --git a/apps/sim/executor/handlers/pi/core/pi-sdk.ts b/apps/sim/executor/handlers/pi/core/sdk.ts similarity index 100% rename from apps/sim/executor/handlers/pi/core/pi-sdk.ts rename to apps/sim/executor/handlers/pi/core/sdk.ts diff --git a/apps/sim/executor/handlers/pi/pi-handler.test.ts b/apps/sim/executor/handlers/pi/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/pi/pi-handler.test.ts rename to apps/sim/executor/handlers/pi/handler.test.ts index 3261a760d6c..5c98a4037e8 100644 --- a/apps/sim/executor/handlers/pi/pi-handler.test.ts +++ b/apps/sim/executor/handlers/pi/handler.test.ts @@ -99,7 +99,7 @@ vi.mock('@/blocks/utils', () => ({ })) import type { PiRunContext } from '@/executor/handlers/pi/core/backend' -import { PiBlockHandler, parsePiReviewMentions } from '@/executor/handlers/pi/pi-handler' +import { PiBlockHandler, parsePiReviewMentions } from '@/executor/handlers/pi/handler' import type { ExecutionContext, StreamingExecution } from '@/executor/types' import { readTrustedExecutionCost } from '@/executor/utils/errors' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/executor/handlers/pi/pi-handler.ts b/apps/sim/executor/handlers/pi/handler.ts similarity index 99% rename from apps/sim/executor/handlers/pi/pi-handler.ts rename to apps/sim/executor/handlers/pi/handler.ts index 84e3e7527b2..ffd8cfbef4a 100644 --- a/apps/sim/executor/handlers/pi/pi-handler.ts +++ b/apps/sim/executor/handlers/pi/handler.ts @@ -88,7 +88,7 @@ function isReviewEvent(value: string): value is PiCloudReviewRunParams['reviewEv * * A switch reaches a handler as `'true'`/`'false'` when its value arrived through * a variable reference, an API trigger payload, or a legacy serialized workflow — - * `wait-handler` coerces the same way. Both polarities need it: a strict `=== true` + * `wait/handler` coerces the same way. Both polarities need it: a strict `=== true` * silently disables an enabled toggle, and a strict `!== false` silently enables a * disabled one. */ @@ -340,7 +340,7 @@ export class PiBlockHandler implements BlockHandler { } // A `switch` subblock reaches a handler as the string 'true' when its value came // through a variable reference, an API trigger payload, or a legacy serialized - // workflow (see the same coercion in `wait-handler`). A strict boolean compare + // workflow (see the same coercion in `wait/handler`). A strict boolean compare // silently opened a draft PR and skipped Babysit entirely while the editor showed // the toggle on and Reviewer Mentions as required. const babysitMode = isSwitchEnabled(inputs.babysitMode) diff --git a/apps/sim/executor/handlers/pi/local/backend.test.ts b/apps/sim/executor/handlers/pi/local/backend.test.ts index 3dadd0c714d..901528b80f0 100644 --- a/apps/sim/executor/handlers/pi/local/backend.test.ts +++ b/apps/sim/executor/handlers/pi/local/backend.test.ts @@ -54,8 +54,8 @@ vi.mock('@/executor/handlers/pi/core/context', () => ({ vi.mock('@/executor/handlers/pi/core/keys', () => ({ mapThinkingLevel: () => 'medium' })) // `toPiTool` stays real so these tests cover its distinct success-content and error-diagnostic // boundaries rather than passing through a stub. -vi.mock('@/executor/handlers/pi/core/pi-sdk', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/executor/handlers/pi/core/sdk', async (importOriginal) => ({ + ...(await importOriginal()), loadPiSdk: () => Promise.resolve(mockSdk), createPiModelRuntime: mockCreatePiModelRuntime, resolvePiSdkModel: () => ({ id: 'claude', provider: 'anthropic' }), diff --git a/apps/sim/executor/handlers/pi/local/backend.ts b/apps/sim/executor/handlers/pi/local/backend.ts index c27af12822b..b685662ebb2 100644 --- a/apps/sim/executor/handlers/pi/local/backend.ts +++ b/apps/sim/executor/handlers/pi/local/backend.ts @@ -22,18 +22,18 @@ import type { import { buildPiPrompt } from '@/executor/handlers/pi/core/context' import { applyPiEvent, createPiTotals, normalizePiEvent } from '@/executor/handlers/pi/core/events' import { mapThinkingLevel } from '@/executor/handlers/pi/core/keys' +import { + createScrubbedPiError, + getScrubbedPiErrorMessage, + scrubPiEvent, +} from '@/executor/handlers/pi/core/redaction' import { createPiModelRuntime, loadPiSdk, type PiSdk, resolvePiSdkModel, toPiTool, -} from '@/executor/handlers/pi/core/pi-sdk' -import { - createScrubbedPiError, - getScrubbedPiErrorMessage, - scrubPiEvent, -} from '@/executor/handlers/pi/core/redaction' +} from '@/executor/handlers/pi/core/sdk' import { buildSshToolSpecs, captureRepoChanges, diff --git a/apps/sim/executor/handlers/pi/search/normalize.ts b/apps/sim/executor/handlers/pi/search/normalize.ts index 890f690d4d5..a7f51b5e894 100644 --- a/apps/sim/executor/handlers/pi/search/normalize.ts +++ b/apps/sim/executor/handlers/pi/search/normalize.ts @@ -42,7 +42,7 @@ export const PI_SEARCH_TRUNCATED_MESSAGE = * number in the Pi block docs (`workflows/blocks/pi.mdx`), so change both. * * Scope is one **block execution**, not one workflow run: the counter lives in the tool spec, and - * both adapters build a fresh spec per execution (`buildPiSearchToolSpec` from `pi-handler.ts`, and + * both adapters build a fresh spec per execution (`buildPiSearchToolSpec` from `pi/handler.ts`, and * one extension load per CLI invocation). A Pi block inside a Loop or Parallel therefore gets this * many searches *per iteration*. That is deliberate — a shared ceiling would fail late iterations of * a legitimate fan-out — but it means the worst-case spend for a run is this times the iteration diff --git a/apps/sim/executor/handlers/registry.ts b/apps/sim/executor/handlers/registry.ts index bbe0e52debb..87f36f08d47 100644 --- a/apps/sim/executor/handlers/registry.ts +++ b/apps/sim/executor/handlers/registry.ts @@ -5,23 +5,23 @@ * Creates handlers for real user blocks (not infrastructure like sentinels). */ -import { AgentBlockHandler } from '@/executor/handlers/agent/agent-handler' -import { ApiBlockHandler } from '@/executor/handlers/api/api-handler' -import { ConditionBlockHandler } from '@/executor/handlers/condition/condition-handler' -import { CredentialBlockHandler } from '@/executor/handlers/credential/credential-handler' -import { CredentialGroupBlockHandler } from '@/executor/handlers/credential-group/credential-group-handler' -import { EvaluatorBlockHandler } from '@/executor/handlers/evaluator/evaluator-handler' -import { FunctionBlockHandler } from '@/executor/handlers/function/function-handler' -import { GenericBlockHandler } from '@/executor/handlers/generic/generic-handler' -import { HumanInTheLoopBlockHandler } from '@/executor/handlers/human-in-the-loop/human-in-the-loop-handler' -import { MothershipBlockHandler } from '@/executor/handlers/mothership/mothership-handler' -import { PiBlockHandler } from '@/executor/handlers/pi/pi-handler' -import { ResponseBlockHandler } from '@/executor/handlers/response/response-handler' -import { RouterBlockHandler } from '@/executor/handlers/router/router-handler' -import { TriggerBlockHandler } from '@/executor/handlers/trigger/trigger-handler' -import { VariablesBlockHandler } from '@/executor/handlers/variables/variables-handler' -import { WaitBlockHandler } from '@/executor/handlers/wait/wait-handler' -import { WorkflowBlockHandler } from '@/executor/handlers/workflow/workflow-handler' +import { AgentBlockHandler } from '@/executor/handlers/agent/handler' +import { ApiBlockHandler } from '@/executor/handlers/api/handler' +import { ConditionBlockHandler } from '@/executor/handlers/condition/handler' +import { CredentialBlockHandler } from '@/executor/handlers/credential/handler' +import { CredentialGroupBlockHandler } from '@/executor/handlers/credential-group/handler' +import { EvaluatorBlockHandler } from '@/executor/handlers/evaluator/handler' +import { FunctionBlockHandler } from '@/executor/handlers/function/handler' +import { GenericBlockHandler } from '@/executor/handlers/generic/handler' +import { HumanInTheLoopBlockHandler } from '@/executor/handlers/human-in-the-loop/handler' +import { MothershipBlockHandler } from '@/executor/handlers/mothership/handler' +import { PiBlockHandler } from '@/executor/handlers/pi/handler' +import { ResponseBlockHandler } from '@/executor/handlers/response/handler' +import { RouterBlockHandler } from '@/executor/handlers/router/handler' +import { TriggerBlockHandler } from '@/executor/handlers/trigger/handler' +import { VariablesBlockHandler } from '@/executor/handlers/variables/handler' +import { WaitBlockHandler } from '@/executor/handlers/wait/handler' +import { WorkflowBlockHandler } from '@/executor/handlers/workflow/handler' import type { BlockHandler } from '@/executor/types' /** diff --git a/apps/sim/executor/handlers/response/response-handler.ts b/apps/sim/executor/handlers/response/handler.ts similarity index 100% rename from apps/sim/executor/handlers/response/response-handler.ts rename to apps/sim/executor/handlers/response/handler.ts diff --git a/apps/sim/executor/handlers/router/router-handler.test.ts b/apps/sim/executor/handlers/router/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/router/router-handler.test.ts rename to apps/sim/executor/handlers/router/handler.test.ts index d958268ed6e..efd6684a7b9 100644 --- a/apps/sim/executor/handlers/router/router-handler.test.ts +++ b/apps/sim/executor/handlers/router/handler.test.ts @@ -38,7 +38,7 @@ vi.mock('@/lib/model-router/resolve', () => ({ import { generateRouterPrompt, generateRouterV2Prompt } from '@/blocks/blocks/router' import { BlockType } from '@/executor/constants' -import { RouterBlockHandler } from '@/executor/handlers/router/router-handler' +import { RouterBlockHandler } from '@/executor/handlers/router/handler' import type { ExecutionContext } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' import { executeProviderRequest } from '@/providers' diff --git a/apps/sim/executor/handlers/router/router-handler.ts b/apps/sim/executor/handlers/router/handler.ts similarity index 100% rename from apps/sim/executor/handlers/router/router-handler.ts rename to apps/sim/executor/handlers/router/handler.ts diff --git a/apps/sim/executor/handlers/trigger/trigger-handler.ts b/apps/sim/executor/handlers/trigger/handler.ts similarity index 100% rename from apps/sim/executor/handlers/trigger/trigger-handler.ts rename to apps/sim/executor/handlers/trigger/handler.ts diff --git a/apps/sim/executor/handlers/variables/variables-handler.test.ts b/apps/sim/executor/handlers/variables/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/variables/variables-handler.test.ts rename to apps/sim/executor/handlers/variables/handler.test.ts index ec9939cef79..31b47e233c9 100644 --- a/apps/sim/executor/handlers/variables/variables-handler.test.ts +++ b/apps/sim/executor/handlers/variables/handler.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { clearLargeValueCacheForTests } from '@/lib/execution/payloads/cache' import { isLargeArrayManifest } from '@/lib/execution/payloads/large-array-manifest-metadata' import { BlockType } from '@/executor/constants' -import { VariablesBlockHandler } from '@/executor/handlers/variables/variables-handler' +import { VariablesBlockHandler } from '@/executor/handlers/variables/handler' import type { ExecutionContext } from '@/executor/types' import type { SerializedBlock } from '@/serializer/types' diff --git a/apps/sim/executor/handlers/variables/variables-handler.ts b/apps/sim/executor/handlers/variables/handler.ts similarity index 100% rename from apps/sim/executor/handlers/variables/variables-handler.ts rename to apps/sim/executor/handlers/variables/handler.ts diff --git a/apps/sim/executor/handlers/wait/wait-handler.test.ts b/apps/sim/executor/handlers/wait/handler.test.ts similarity index 98% rename from apps/sim/executor/handlers/wait/wait-handler.test.ts rename to apps/sim/executor/handlers/wait/handler.test.ts index bbe580df01b..d199f875d53 100644 --- a/apps/sim/executor/handlers/wait/wait-handler.test.ts +++ b/apps/sim/executor/handlers/wait/handler.test.ts @@ -2,7 +2,7 @@ import '@sim/testing/mocks/executor' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { BlockType } from '@/executor/constants' -import { WaitBlockHandler } from '@/executor/handlers/wait/wait-handler' +import { WaitBlockHandler } from '@/executor/handlers/wait/handler' import type { ExecutionContext } from '@/executor/types' import type { SerializedBlock } from '@/serializer/types' diff --git a/apps/sim/executor/handlers/wait/wait-handler.ts b/apps/sim/executor/handlers/wait/handler.ts similarity index 100% rename from apps/sim/executor/handlers/wait/wait-handler.ts rename to apps/sim/executor/handlers/wait/handler.ts diff --git a/apps/sim/executor/handlers/workflow/custom-block-tool-runner.test.ts b/apps/sim/executor/handlers/workflow/custom-block-tool-runner.test.ts index 9380148d94b..e483a7fc897 100644 --- a/apps/sim/executor/handlers/workflow/custom-block-tool-runner.test.ts +++ b/apps/sim/executor/handlers/workflow/custom-block-tool-runner.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi } from 'vitest' const { mockExecute } = vi.hoisted(() => ({ mockExecute: vi.fn() })) -vi.mock('@/executor/handlers/workflow/workflow-handler', () => ({ +vi.mock('@/executor/handlers/workflow/handler', () => ({ WorkflowBlockHandler: class { execute = mockExecute }, diff --git a/apps/sim/executor/handlers/workflow/custom-block-tool-runner.ts b/apps/sim/executor/handlers/workflow/custom-block-tool-runner.ts index a95e9ef4390..99e6c6aa339 100644 --- a/apps/sim/executor/handlers/workflow/custom-block-tool-runner.ts +++ b/apps/sim/executor/handlers/workflow/custom-block-tool-runner.ts @@ -3,9 +3,9 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { isPlainRecord, isRecordLike } from '@sim/utils/object' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { PiiBlockOutputRedaction } from '@/executor/execution/types' -import { WorkflowBlockHandler } from '@/executor/handlers/workflow/workflow-handler' +import { WorkflowBlockHandler } from '@/executor/handlers/workflow/handler' import type { ExecutionContext, ExecutorDelegationOrigin } from '@/executor/types' import { projectResolvedSecretDiagnosticContent } from '@/executor/utils/resolved-secret-content-projection' import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts b/apps/sim/executor/handlers/workflow/handler.test.ts similarity index 99% rename from apps/sim/executor/handlers/workflow/workflow-handler.test.ts rename to apps/sim/executor/handlers/workflow/handler.test.ts index 02245ba2594..f738a2533d7 100644 --- a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts +++ b/apps/sim/executor/handlers/workflow/handler.test.ts @@ -28,7 +28,7 @@ import { findMissingRequiredCustomBlockInputs, remapCustomBlockInputKeys, WorkflowBlockHandler, -} from '@/executor/handlers/workflow/workflow-handler' +} from '@/executor/handlers/workflow/handler' import type { ExecutionContext } from '@/executor/types' import { ANONYMOUS_SECRET_TRACE_REPLACEMENT, @@ -101,7 +101,7 @@ vi.mock('@/executor', () => ({ }, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) const mockGetPersonalAndWorkspaceEnv = environmentUtilsMockFns.mockGetPersonalAndWorkspaceEnv diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.ts b/apps/sim/executor/handlers/workflow/handler.ts similarity index 99% rename from apps/sim/executor/handlers/workflow/workflow-handler.ts rename to apps/sim/executor/handlers/workflow/handler.ts index d668a6f2e15..b85f69f7864 100644 --- a/apps/sim/executor/handlers/workflow/workflow-handler.ts +++ b/apps/sim/executor/handlers/workflow/handler.ts @@ -3,7 +3,7 @@ import { findCause, getErrorMessage, toError } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { isRecordLike } from '@sim/utils/object' import type { Variable, WorkflowState } from '@sim/workflow-types/workflow' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { inheritFailureMarks, markFailureKind, diff --git a/apps/sim/executor/handlers/workflow/workflow-tool-runner.test.ts b/apps/sim/executor/handlers/workflow/tool-runner.test.ts similarity index 98% rename from apps/sim/executor/handlers/workflow/workflow-tool-runner.test.ts rename to apps/sim/executor/handlers/workflow/tool-runner.test.ts index 40c751e23fc..534743ec43b 100644 --- a/apps/sim/executor/handlers/workflow/workflow-tool-runner.test.ts +++ b/apps/sim/executor/handlers/workflow/tool-runner.test.ts @@ -6,7 +6,7 @@ const { mockExecute } = vi.hoisted(() => ({ mockExecute: vi.fn(), })) -vi.mock('@/executor/handlers/workflow/workflow-handler', () => ({ +vi.mock('@/executor/handlers/workflow/handler', () => ({ WorkflowBlockHandler: class { execute = mockExecute }, @@ -17,7 +17,7 @@ vi.mock('@/lib/core/security/encryption', () => encryptionMock) import { projectToolResultForCopilot } from '@/lib/mothership/request/tools/resolved-secret-result' import type { ToolExecutionResult } from '@/lib/mothership/tool-executor/types' import { ExecutionState } from '@/executor/execution/state' -import { runWorkflowTool } from '@/executor/handlers/workflow/workflow-tool-runner' +import { runWorkflowTool } from '@/executor/handlers/workflow/tool-runner' import type { ExecutionContext } from '@/executor/types' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' import { EnvResolver } from '@/executor/variables/resolvers/env' diff --git a/apps/sim/executor/handlers/workflow/workflow-tool-runner.ts b/apps/sim/executor/handlers/workflow/tool-runner.ts similarity index 98% rename from apps/sim/executor/handlers/workflow/workflow-tool-runner.ts rename to apps/sim/executor/handlers/workflow/tool-runner.ts index d8d75d8f12a..6ce87ef86d1 100644 --- a/apps/sim/executor/handlers/workflow/workflow-tool-runner.ts +++ b/apps/sim/executor/handlers/workflow/tool-runner.ts @@ -11,7 +11,7 @@ import { buildCustomBlockExecutionContext, type CustomBlockExecutorContext, } from '@/executor/handlers/workflow/custom-block-tool-runner' -import { WorkflowBlockHandler } from '@/executor/handlers/workflow/workflow-handler' +import { WorkflowBlockHandler } from '@/executor/handlers/workflow/handler' import type { ExecutorDelegationOrigin } from '@/executor/types' import { classifyExecutionError } from '@/executor/utils/errors' import { parseJSON } from '@/executor/utils/json' @@ -42,7 +42,7 @@ function aggregateChildCost(childTraceSpans: TraceSpan[]): number { * propagated, and `forkForPropagatedEntries` (the fork every model boundary projects through) * keeps only propagated entries. Without this crossing a value the child resolved from an * environment variable is dropped from the projection registry and reaches the model vendor in - * plaintext. Mirrors the custom-block crossing in `workflow-handler`, and fails closed: an + * plaintext. Mirrors the custom-block crossing in `workflow/handler`, and fails closed: an * unusable envelope marks the registry incomplete, which reduces the result the model sees. */ async function markResultProvenanceCrossing( @@ -86,7 +86,7 @@ interface WorkflowToolParams { * reproducible handle to the workflow's provider. * * The child runs under the invoking run's environment variables and block-output - * redaction policy, matching the canvas workflow block — `workflow-handler.ts` + * redaction policy, matching the canvas workflow block — `workflow/handler.ts` * keeps both from the parent context on the non-custom branch. The handler's * same-workspace assert bounds that forwarding to a single workspace. */ diff --git a/apps/sim/executor/orchestrators/loop.ts b/apps/sim/executor/orchestrators/loop.ts index 25e8fdcf7d3..1f4a848c238 100644 --- a/apps/sim/executor/orchestrators/loop.ts +++ b/apps/sim/executor/orchestrators/loop.ts @@ -18,6 +18,8 @@ import type { BlockStateController, ContextExtensions } from '@/executor/executi import type { ExecutionContext, NormalizedBlockOutput } from '@/executor/types' import { createReferencePattern } from '@/executor/utils/reference-validation' import { projectResolvedSecretDiagnosticError } from '@/executor/utils/resolved-secret-content-projection' +import { addSubflowErrorLog, emitSubflowSuccessEvents } from '@/executor/utils/subflow' +import { resolveArrayInputAsync } from '@/executor/utils/subflow.server' import { buildLoopSentinelEndId, buildLoopSentinelStartId, @@ -28,8 +30,6 @@ import { extractParallelIdFromSentinel, } from '@/executor/utils/subflow-node-id-codec' import { mergeSubflowSecretProvenance } from '@/executor/utils/subflow-secret-provenance' -import { addSubflowErrorLog, emitSubflowSuccessEvents } from '@/executor/utils/subflow-utils' -import { resolveArrayInputAsync } from '@/executor/utils/subflow-utils.server' import type { VariableResolver } from '@/executor/variables/resolver' const logger = createLogger('LoopOrchestrator') diff --git a/apps/sim/executor/orchestrators/parallel.ts b/apps/sim/executor/orchestrators/parallel.ts index d4336726a68..7e449ad7d02 100644 --- a/apps/sim/executor/orchestrators/parallel.ts +++ b/apps/sim/executor/orchestrators/parallel.ts @@ -8,6 +8,8 @@ import type { ParallelScope } from '@/executor/execution/state' import type { BlockStateController, ContextExtensions } from '@/executor/execution/types' import type { ExecutionContext, NormalizedBlockOutput } from '@/executor/types' import { type ClonedSubflowInfo, ParallelExpander } from '@/executor/utils/parallel-expansion' +import { addSubflowErrorLog, emitSubflowSuccessEvents } from '@/executor/utils/subflow' +import { resolveArrayInputAsync } from '@/executor/utils/subflow.server' import { buildBranchNodeId, buildLoopSentinelEndId, @@ -18,8 +20,6 @@ import { extractBranchIndex, } from '@/executor/utils/subflow-node-id-codec' import { mergeSubflowSecretProvenance } from '@/executor/utils/subflow-secret-provenance' -import { addSubflowErrorLog, emitSubflowSuccessEvents } from '@/executor/utils/subflow-utils' -import { resolveArrayInputAsync } from '@/executor/utils/subflow-utils.server' import type { VariableResolver } from '@/executor/variables/resolver' import type { SerializedParallel } from '@/serializer/types' diff --git a/apps/sim/executor/types.ts b/apps/sim/executor/types.ts index 136536a769a..fc45af27396 100644 --- a/apps/sim/executor/types.ts +++ b/apps/sim/executor/types.ts @@ -1,5 +1,5 @@ import type { WorkflowExecutionAuthority, WorkflowExecutionPrincipal } from '@sim/auth/principal' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { TraceSpan } from '@/lib/logs/types' import type { PermissionGroupConfig } from '@/lib/permission-groups/fields' import type { BlockOutput } from '@/blocks/types' diff --git a/apps/sim/executor/utils/block-data.ts b/apps/sim/executor/utils/block-data.ts index a93ae8084a6..e3fb8a03130 100644 --- a/apps/sim/executor/utils/block-data.ts +++ b/apps/sim/executor/utils/block-data.ts @@ -1,5 +1,5 @@ -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { getBlock } from '@/blocks/registry' import { isTriggerBehavior, normalizeName } from '@/executor/constants' import type { ExecutionContext } from '@/executor/types' diff --git a/apps/sim/executor/utils/errors.test.ts b/apps/sim/executor/utils/errors.test.ts index 280245fde5b..e318f923574 100644 --- a/apps/sim/executor/utils/errors.test.ts +++ b/apps/sim/executor/utils/errors.test.ts @@ -46,7 +46,7 @@ describe('getExecutionErrorStatus', () => { }) it("never adopts an upstream target's duck-typed status as our own", () => { - // `api-handler` copies the remote response's status onto the thrown error. + // `api/handler` copies the remote response's status onto the thrown error. // Adopting it would make a remote 404 the workflow API's 404. const error = Object.assign(new Error('HTTP 404'), { status: 404 }) expect(getExecutionErrorStatus(error)).toBe(500) @@ -88,7 +88,7 @@ describe('hosted-key status survives the ToolResponse flattening', () => { /** * `executeTool` catches a thrown error and returns a `ToolResponse`, so the * status has to ride `ToolResponse.statusCode` and be re-attached by - * `generic-handler`. This reproduces that hand-off end to end. + * `generic/handler`. This reproduces that hand-off end to end. */ function errorFromFailedToolResponse(response: { error: string diff --git a/apps/sim/executor/utils/errors.ts b/apps/sim/executor/utils/errors.ts index e3f0a9ee9b8..805e54bcfd9 100644 --- a/apps/sim/executor/utils/errors.ts +++ b/apps/sim/executor/utils/errors.ts @@ -183,9 +183,9 @@ const MAX_CAUSE_DEPTH = 8 * set deep in a tool survives the block-level wrapping that rebuilds the error. * * Reads only SIM-OWNED carriers: `HttpError.statusCode` (canonical) and the - * `statusCode` field `generic-handler` re-attaches from a failed `ToolResponse`. + * `statusCode` field `generic/handler` re-attaches from a failed `ToolResponse`. * Deliberately does NOT read the duck-typed `status` field: that carries an - * UPSTREAM target's status (`api-handler` copies it off the remote response, and + * UPSTREAM target's status (`api/handler` copies it off the remote response, and * transformed HTTP tool errors carry it too). Adopting it would turn a remote * 404 into the workflow API's 404, colliding with the statuses that route owns * (404 = workflow not found, 401 = bad API key, 429 = Sim rate limit). diff --git a/apps/sim/executor/utils/file-tool-processor.test.ts b/apps/sim/executor/utils/file-tool-processor.test.ts index fedb4201a87..1fe22b25296 100644 --- a/apps/sim/executor/utils/file-tool-processor.test.ts +++ b/apps/sim/executor/utils/file-tool-processor.test.ts @@ -18,7 +18,7 @@ import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import type { ExecutionContext, UserFile } from '@/executor/types' import type { ToolConfig, ToolDefinition } from '@/tools/types' -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) vi.mock('@/lib/uploads/contexts/copilot', () => uploadsCopilotMock) diff --git a/apps/sim/executor/utils/file-tool-processor.ts b/apps/sim/executor/utils/file-tool-processor.ts index f10d286cbc9..23fbedb2ebd 100644 --- a/apps/sim/executor/utils/file-tool-processor.ts +++ b/apps/sim/executor/utils/file-tool-processor.ts @@ -9,7 +9,7 @@ import { } from '@/lib/internal/tool-operations/file-result' import { storeInternalToolFileResult } from '@/lib/internal/tool-operations/file-result.server' import type { InternalToolOperationContext } from '@/lib/internal/tool-operations/types' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import type { UserFile } from '@/executor/types' import type { ToolDefinition } from '@/tools/types' diff --git a/apps/sim/executor/utils/start-block.ts b/apps/sim/executor/utils/start-block.ts index 7e67f42a81e..e2efde6d84a 100644 --- a/apps/sim/executor/utils/start-block.ts +++ b/apps/sim/executor/utils/start-block.ts @@ -6,7 +6,7 @@ import { inferContextFromKey, isInternalFileUrl, parseInternalFileUrl, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { classifyStartBlockType, resolveStartCandidates, diff --git a/apps/sim/executor/utils/subflow-utils.server.ts b/apps/sim/executor/utils/subflow.server.ts similarity index 100% rename from apps/sim/executor/utils/subflow-utils.server.ts rename to apps/sim/executor/utils/subflow.server.ts diff --git a/apps/sim/executor/utils/subflow-utils.test.ts b/apps/sim/executor/utils/subflow.test.ts similarity index 99% rename from apps/sim/executor/utils/subflow-utils.test.ts rename to apps/sim/executor/utils/subflow.test.ts index 55b3ba6329e..4d2fd126f1a 100644 --- a/apps/sim/executor/utils/subflow-utils.test.ts +++ b/apps/sim/executor/utils/subflow.test.ts @@ -6,8 +6,8 @@ import { } from '@/lib/execution/payloads/large-array-manifest-metadata' import { LARGE_VALUE_REF_MARKER } from '@/lib/execution/payloads/large-value-ref' import type { ExecutionContext } from '@/executor/types' +import { resolveArrayInputAsync } from '@/executor/utils/subflow.server' import { findEffectiveContainerId } from '@/executor/utils/subflow-node-id-codec' -import { resolveArrayInputAsync } from '@/executor/utils/subflow-utils.server' import type { VariableResolver } from '@/executor/variables/resolver' describe('resolveArrayInputAsync', () => { diff --git a/apps/sim/executor/utils/subflow-utils.ts b/apps/sim/executor/utils/subflow.ts similarity index 100% rename from apps/sim/executor/utils/subflow-utils.ts rename to apps/sim/executor/utils/subflow.ts diff --git a/apps/sim/executor/variables/resolver.test.ts b/apps/sim/executor/variables/resolver.test.ts index c517dc83d7c..2c04272492f 100644 --- a/apps/sim/executor/variables/resolver.test.ts +++ b/apps/sim/executor/variables/resolver.test.ts @@ -258,7 +258,7 @@ function runResolvedCondition(expression: string): { matched: boolean; injected: /** * Completes the round trip a condition actually takes: resolver, then the execution-boundary - * compiler, then evaluation of the same `Boolean(...)` wrapper `condition-handler.ts` builds. + * compiler, then evaluation of the same `Boolean(...)` wrapper `condition/handler.ts` builds. */ async function evaluateResolvedCondition( value: string, diff --git a/apps/sim/executor/variables/resolvers/loop.ts b/apps/sim/executor/variables/resolvers/loop.ts index 0295e89abd5..390bfa340ce 100644 --- a/apps/sim/executor/variables/resolvers/loop.ts +++ b/apps/sim/executor/variables/resolvers/loop.ts @@ -3,6 +3,7 @@ import { assertNoLargeValueRefs } from '@/lib/execution/payloads/large-value-ref import { isReference, normalizeName, parseReferencePath, REFERENCE } from '@/executor/constants' import { InvalidFieldError } from '@/executor/utils/block-reference' import type { ResolvedSecretTraceProvenanceV1 } from '@/executor/utils/resolved-secret-trace-registry' +import { isSubflowNestedInside, subflowContainsBlock } from '@/executor/utils/subflow' import { extractInnermostOuterBranchIndex, extractOuterBranchIndex, @@ -10,7 +11,6 @@ import { stripCloneSuffixes, stripOuterBranchSuffix, } from '@/executor/utils/subflow-node-id-codec' -import { isSubflowNestedInside, subflowContainsBlock } from '@/executor/utils/subflow-utils' import { type AsyncPathNavigator, navigatePath, diff --git a/apps/sim/executor/variables/resolvers/parallel.ts b/apps/sim/executor/variables/resolvers/parallel.ts index 83aef7d49d7..d7217f4ce62 100644 --- a/apps/sim/executor/variables/resolvers/parallel.ts +++ b/apps/sim/executor/variables/resolvers/parallel.ts @@ -3,6 +3,7 @@ import { assertNoLargeValueRefs } from '@/lib/execution/payloads/large-value-ref import { isReference, normalizeName, parseReferencePath, REFERENCE } from '@/executor/constants' import { InvalidFieldError } from '@/executor/utils/block-reference' import type { ResolvedSecretTraceProvenanceV1 } from '@/executor/utils/resolved-secret-trace-registry' +import { isSubflowNestedInside, subflowContainsBlock } from '@/executor/utils/subflow' import { extractBranchIndex, extractInnermostOuterBranchIndex, @@ -11,7 +12,6 @@ import { stripCloneSuffixes, stripOuterBranchSuffix, } from '@/executor/utils/subflow-node-id-codec' -import { isSubflowNestedInside, subflowContainsBlock } from '@/executor/utils/subflow-utils' import { type AsyncPathNavigator, navigatePath, diff --git a/apps/sim/executor/variables/resolvers/workflow.test.ts b/apps/sim/executor/variables/resolvers/workflow.test.ts index e2c830d6cf2..3c36a114ea4 100644 --- a/apps/sim/executor/variables/resolvers/workflow.test.ts +++ b/apps/sim/executor/variables/resolvers/workflow.test.ts @@ -23,7 +23,7 @@ uploadsMetadataMockFns.mockInsertImmutableFileMetadata.mockResolvedValue({ uploadsMetadataMockFns.mockInsertFileMetadata.mockResolvedValue({ id: 'execution-payload-file' }) uploadsMetadataMockFns.mockDeleteFileMetadata.mockResolvedValue(undefined) -vi.mock('@/lib/workflows/variables/variable-manager', () => ({ +vi.mock('@/lib/workflows/variables/manager', () => ({ VariableManager: { resolveForExecution: vi.fn((value) => value), }, diff --git a/apps/sim/executor/variables/resolvers/workflow.ts b/apps/sim/executor/variables/resolvers/workflow.ts index 8d0c778016b..3cbdc7decee 100644 --- a/apps/sim/executor/variables/resolvers/workflow.ts +++ b/apps/sim/executor/variables/resolvers/workflow.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { isLargeArrayManifest } from '@/lib/execution/payloads/large-array-manifest-metadata' import { assertNoLargeValueRefs, isLargeValueRef } from '@/lib/execution/payloads/large-value-ref' -import { VariableManager } from '@/lib/workflows/variables/variable-manager' +import { VariableManager } from '@/lib/workflows/variables/manager' import { isReference, normalizeName, parseReferencePath, REFERENCE } from '@/executor/constants' import { type AsyncPathNavigator, diff --git a/apps/sim/hooks/queries/admin-users.test.ts b/apps/sim/hooks/queries/admin-users.test.ts index 00ccb83af24..554b42c0a0e 100644 --- a/apps/sim/hooks/queries/admin-users.test.ts +++ b/apps/sim/hooks/queries/admin-users.test.ts @@ -6,7 +6,7 @@ import { authClientMock, authClientMockFns } from '@sim/testing/mocks/auth-clien import { urlsMockFns } from '@sim/testing/mocks/urls.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/api/client/request', () => apiClientRequestMock) diff --git a/apps/sim/hooks/queries/admin-users.ts b/apps/sim/hooks/queries/admin-users.ts index a5f26a717e1..9c3123a6bad 100644 --- a/apps/sim/hooks/queries/admin-users.ts +++ b/apps/sim/hooks/queries/admin-users.ts @@ -4,7 +4,7 @@ import { isValidUuid } from '@sim/utils/id' import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { requestJson } from '@/lib/api/client/request' import { forgetPasswordContract } from '@/lib/api/contracts' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { getBaseUrl } from '@/lib/core/utils/urls' const logger = createLogger('AdminUsersQuery') diff --git a/apps/sim/hooks/queries/benchmarks.test.tsx b/apps/sim/hooks/queries/benchmarks.test.tsx index 2a474dbca2e..c1ae8639145 100644 --- a/apps/sim/hooks/queries/benchmarks.test.tsx +++ b/apps/sim/hooks/queries/benchmarks.test.tsx @@ -22,7 +22,7 @@ import { } from '@/hooks/queries/benchmarks' vi.mock('@/lib/api/client/request', () => apiClientRequestMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) let root: Root let client: QueryClient let container: HTMLDivElement diff --git a/apps/sim/hooks/queries/benchmarks.ts b/apps/sim/hooks/queries/benchmarks.ts index b085603013d..8d37b3c273f 100644 --- a/apps/sim/hooks/queries/benchmarks.ts +++ b/apps/sim/hooks/queries/benchmarks.ts @@ -23,7 +23,7 @@ import { type UpdateBenchmarkBody, updateBenchmarkContract, } from '@/lib/api/contracts/benchmarks' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { readBenchmarkRunResponse } from '@/lib/benchmarks/run-stream' function useBenchmarkKeys() { diff --git a/apps/sim/hooks/queries/kb/knowledge.test.ts b/apps/sim/hooks/queries/kb/knowledge.test.ts index a3d9329521e..7516f13add3 100644 --- a/apps/sim/hooks/queries/kb/knowledge.test.ts +++ b/apps/sim/hooks/queries/kb/knowledge.test.ts @@ -5,7 +5,7 @@ import { emcnMock } from '@sim/testing/mocks/emcn.mock' import { reactQueryMock, reactQueryMockFns } from '@sim/testing/mocks/react-query.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/core/config/deployment-shape', () => deploymentShapeMock) diff --git a/apps/sim/hooks/queries/kb/knowledge.ts b/apps/sim/hooks/queries/kb/knowledge.ts index 754f8df5236..9d1aeacd8b3 100644 --- a/apps/sim/hooks/queries/kb/knowledge.ts +++ b/apps/sim/hooks/queries/kb/knowledge.ts @@ -56,7 +56,7 @@ import { } from '@/lib/api/contracts/knowledge' import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge/search' import type { NativeSearchQuery } from '@/lib/api/contracts/mothership-assistant-tools' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import type { ChunkingStrategy, StrategyOptions } from '@/lib/chunkers/types' import { type ResourceScope, diff --git a/apps/sim/hooks/queries/oauth-provider.test.tsx b/apps/sim/hooks/queries/oauth-provider.test.tsx index 95eb88686a0..2ccb77959db 100644 --- a/apps/sim/hooks/queries/oauth-provider.test.tsx +++ b/apps/sim/hooks/queries/oauth-provider.test.tsx @@ -10,7 +10,7 @@ import { createRoot, type Root } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/api/client/request', () => apiClientRequestMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { useOAuthConsent, useOAuthSwitchAccount } from '@/hooks/queries/oauth-provider' diff --git a/apps/sim/hooks/queries/oauth-provider.ts b/apps/sim/hooks/queries/oauth-provider.ts index d13ed40f48e..0e33d5ab94e 100644 --- a/apps/sim/hooks/queries/oauth-provider.ts +++ b/apps/sim/hooks/queries/oauth-provider.ts @@ -5,7 +5,7 @@ import { listAuthorizedAppsContract, revokeAuthorizedAppContract, } from '@/lib/api/contracts/user' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' export const oauthProviderKeys = { all: ['oauth-provider'] as const, @@ -88,7 +88,7 @@ export function useOAuthPublicClient(clientId?: string, authorizationRequestKey? * Records the user's decision and returns where the browser goes next: the * client's `redirect_uri` with an authorization code, or with * `error=access_denied` when declined. The signed authorize query travels in - * the request body automatically (see `oauthProviderClient` in `auth-client`). + * the request body automatically (see `oauthProviderClient` in `lib/auth/client`). */ export function useOAuthConsent() { return useMutation({ diff --git a/apps/sim/hooks/queries/oauth/connections.test.tsx b/apps/sim/hooks/queries/oauth/connections.test.tsx index 3adabd5586f..8c0cbee19af 100644 --- a/apps/sim/hooks/queries/oauth/connections.test.tsx +++ b/apps/sim/hooks/queries/oauth/connections.test.tsx @@ -11,7 +11,7 @@ import { createRoot } from 'react-dom/client' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/api/client/request', () => apiClientRequestMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/desktop', () => libDesktopMock) vi.mock('@/lib/oauth', () => ({ OAUTH_PROVIDERS: {} })) diff --git a/apps/sim/hooks/queries/oauth/connections.ts b/apps/sim/hooks/queries/oauth/connections.ts index 92621e907bf..beaf36c6e67 100644 --- a/apps/sim/hooks/queries/oauth/connections.ts +++ b/apps/sim/hooks/queries/oauth/connections.ts @@ -7,7 +7,7 @@ import { type OAuthAccountSummary, type OAuthConnection, } from '@/lib/api/contracts/oauth-connections' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { OAUTH_CREDENTIAL_DRAFT_CALLBACK_PARAM } from '@/lib/credentials/draft-constants' import { getDesktopBridge } from '@/lib/desktop' import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth' diff --git a/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.test.ts b/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.test.ts index 28e19c9d925..e7368fc9338 100644 --- a/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.test.ts +++ b/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.test.ts @@ -8,7 +8,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { createRoot, type Root } from 'react-dom/client' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/lib/desktop', () => libDesktopMock) diff --git a/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.ts b/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.ts index acc72a6a733..a517661249f 100644 --- a/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.ts +++ b/apps/sim/hooks/queries/oauth/microsoft-dataverse-connections.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { OAUTH_CREDENTIAL_DRAFT_CALLBACK_PARAM } from '@/lib/credentials/draft-constants' import { getDesktopBridge } from '@/lib/desktop' import { diff --git a/apps/sim/hooks/queries/organization.test.tsx b/apps/sim/hooks/queries/organization.test.tsx index 0a1a52d2b29..de1f85d253b 100644 --- a/apps/sim/hooks/queries/organization.test.tsx +++ b/apps/sim/hooks/queries/organization.test.tsx @@ -21,7 +21,7 @@ vi.mock('next/navigation', () => nextNavigationMock) vi.mock('@/lib/api/client/request', () => apiClientRequestMock) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { getOrganizationPlanSeatsContract, diff --git a/apps/sim/hooks/queries/organization.ts b/apps/sim/hooks/queries/organization.ts index 8a675005c59..498c68c15ae 100644 --- a/apps/sim/hooks/queries/organization.ts +++ b/apps/sim/hooks/queries/organization.ts @@ -26,7 +26,7 @@ import { updateOrganizationMemberUsageLimitContract, updateOrganizationUsageLimitContract, } from '@/lib/api/contracts/organization' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { workspaceCredentialKeys } from '@/hooks/queries/utils/credential-keys' import { organizationKeys } from '@/hooks/queries/utils/organization-keys' import { organizationUsageKeys } from '@/hooks/queries/utils/organization-usage-keys' diff --git a/apps/sim/hooks/queries/search-history.ts b/apps/sim/hooks/queries/search-history.ts index d989ab9fb3d..0b20a7f5bc3 100644 --- a/apps/sim/hooks/queries/search-history.ts +++ b/apps/sim/hooks/queries/search-history.ts @@ -6,7 +6,7 @@ import { type RecordSearchHistoryBody, recordSearchHistoryContract, } from '@/lib/api/contracts/knowledge/search-history' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' export const SEARCH_HISTORY_STALE_TIME = 30_000 export const searchHistoryKeys = { diff --git a/apps/sim/hooks/queries/session.test.ts b/apps/sim/hooks/queries/session.test.ts index 3caa2f22c1b..15b083ced1f 100644 --- a/apps/sim/hooks/queries/session.test.ts +++ b/apps/sim/hooks/queries/session.test.ts @@ -2,7 +2,7 @@ import { authClientMock, authClientMockFns } from '@sim/testing/mocks/auth-clien import { QueryClient } from '@tanstack/react-query' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { refreshSessionQuery, sessionKeys } from '@/hooks/queries/session' diff --git a/apps/sim/hooks/queries/session.ts b/apps/sim/hooks/queries/session.ts index 5cb0e57c232..addfada6a9c 100644 --- a/apps/sim/hooks/queries/session.ts +++ b/apps/sim/hooks/queries/session.ts @@ -1,5 +1,5 @@ import { type QueryClient, useQuery, useQueryClient } from '@tanstack/react-query' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { type AppSession, extractSessionDataFromAuthClientResult, diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts index 90b8a978f97..206ee5f20d9 100644 --- a/apps/sim/hooks/use-collaborative-workflow.ts +++ b/apps/sim/hooks/use-collaborative-workflow.ts @@ -24,7 +24,7 @@ import { isEqual } from 'es-toolkit' import { useShallow } from 'zustand/react/shallow' import { requestJson } from '@/lib/api/client/request' import { getWorkflowStateContract } from '@/lib/api/contracts' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { WORKFLOW_EXTERNAL_UPDATE_EVENT } from '@/lib/workflows/external-update' import { type WorkflowSearchSubflowFieldId, diff --git a/apps/sim/hooks/use-oauth-return.ts b/apps/sim/hooks/use-oauth-return.ts index da04b0b4bbf..160b944ddfa 100644 --- a/apps/sim/hooks/use-oauth-return.ts +++ b/apps/sim/hooks/use-oauth-return.ts @@ -29,7 +29,7 @@ import { getDesktopBridge } from '@/lib/desktop' import { organizationRoutes } from '@/lib/navigation/paths' import { SETTINGS_RETURN_URL_KEY } from '@/lib/navigation/settings-return' import { stripMicrosoftDataverseEnvironmentFromOAuthCallback } from '@/lib/oauth/microsoft-dataverse' -import { searchSetupAccessParam } from '@/lib/sim-search/search-params' +import { searchSetupAccessParam } from '@/lib/sim-search/params' import { organizationSearchSetupPath } from '@/lib/sim-search/setup-navigation' import { oauthConnectionsKeys } from '@/hooks/queries/oauth/connections' import { diff --git a/apps/sim/hooks/use-settings-navigation.test.ts b/apps/sim/hooks/use-settings-navigation.test.ts index e3ee76c8ece..9888593a48f 100644 --- a/apps/sim/hooks/use-settings-navigation.test.ts +++ b/apps/sim/hooks/use-settings-navigation.test.ts @@ -3,13 +3,13 @@ import { describe, expect, it, vi } from 'vitest' import type { WorkspaceHostContext } from '@/lib/api/contracts/workspaces' /** - * `@/lib/auth/auth-client` builds a Better Auth client at module scope, which + * `@/lib/auth/client` builds a Better Auth client at module scope, which * throws when NEXT_PUBLIC_APP_URL is absent from the environment (and under * `isolate: false` an earlier file may have imported the graph in a polluted * env). This test only exercises the pure `resolveSettingsHref`, so stub the * client module out entirely. */ -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) import { resolveSettingsHref } from '@/hooks/use-settings-navigation' diff --git a/apps/sim/hooks/use-settings-navigation.ts b/apps/sim/hooks/use-settings-navigation.ts index 534309ab677..5f8add50199 100644 --- a/apps/sim/hooks/use-settings-navigation.ts +++ b/apps/sim/hooks/use-settings-navigation.ts @@ -3,7 +3,7 @@ import { useCallback } from 'react' import { useParams, useRouter } from 'next/navigation' import type { WorkspaceHostContext } from '@/lib/api/contracts/workspaces' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { canManageWorkspaceBilling } from '@/lib/billing/workspace-permissions' import { APP_ENTRY_PATH } from '@/lib/navigation/paths' import { popSettingsReturnUrl, rememberSettingsReturnUrl } from '@/lib/navigation/settings-return' diff --git a/apps/sim/hooks/use-undo-redo.ts b/apps/sim/hooks/use-undo-redo.ts index 1fe1a03cb5f..7059f80eea8 100644 --- a/apps/sim/hooks/use-undo-redo.ts +++ b/apps/sim/hooks/use-undo-redo.ts @@ -19,7 +19,7 @@ import { UNDO_REDO_OPERATIONS, } from '@sim/realtime-protocol/constants' import type { Edge } from '@xyflow/react' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import { enqueueReplaceWorkflowState } from '@/lib/workflows/operations/socket-operations' import { WORKFLOW_SEARCH_SUBFLOW_FIELD_IDS } from '@/lib/workflows/search-replace/subflow-fields' import { useOperationQueue } from '@/stores/operation-queue/store' diff --git a/apps/sim/hooks/use-user-permissions.ts b/apps/sim/hooks/use-user-permissions.ts index 8b08e9d5999..b9836c02e1f 100644 --- a/apps/sim/hooks/use-user-permissions.ts +++ b/apps/sim/hooks/use-user-permissions.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { createLogger } from '@sim/logger' -import { useSession } from '@/lib/auth/auth-client' +import { useSession } from '@/lib/auth/client' import type { WorkspacePermissions } from '@/hooks/queries/workspace' export type PermissionType = 'admin' | 'write' | 'read' diff --git a/apps/sim/lib/admin/dashboard-credit-grant.test.ts b/apps/sim/lib/admin/dashboard-credit-grant.test.ts index a3512962049..2109c886ef3 100644 --- a/apps/sim/lib/admin/dashboard-credit-grant.test.ts +++ b/apps/sim/lib/admin/dashboard-credit-grant.test.ts @@ -36,7 +36,7 @@ vi.mock('@/lib/core/idempotency/transaction', () => ({ vi.mock('@sim/utils/id', () => idMock) vi.mock('@/lib/billing/core/plan', () => billingPlanMock) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/organizations/member-limits', () => organizationMemberLimitsMock) vi.mock('@/lib/billing/organizations/seats', () => organizationSeatsMock) vi.mock('@/lib/billing/core/usage', () => billingUsageMock) diff --git a/apps/sim/lib/admin/dashboard-organizations.test.ts b/apps/sim/lib/admin/dashboard-organizations.test.ts index 57b494e1012..bb25275d0c1 100644 --- a/apps/sim/lib/admin/dashboard-organizations.test.ts +++ b/apps/sim/lib/admin/dashboard-organizations.test.ts @@ -52,7 +52,7 @@ vi.mock('@/lib/billing/enterprise-outbox', () => ({ resolveEnterpriseMetadataIntent: hoistedMocks.resolveMetadataIntent, })) vi.mock('@/lib/billing/organizations/member-limits', () => organizationMemberLimitsMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) vi.mock('@/lib/billing/organizations/seats', () => organizationSeatsMock) vi.mock('@/lib/billing/validation/seat-management', () => ({ diff --git a/apps/sim/lib/admin/dashboard.ts b/apps/sim/lib/admin/dashboard.ts index 83add513a13..a81cc0af77b 100644 --- a/apps/sim/lib/admin/dashboard.ts +++ b/apps/sim/lib/admin/dashboard.ts @@ -56,7 +56,7 @@ import { parseWorkflowExecutionTimeoutSeconds, resolveEnterpriseWorkflowExecutionTimeoutFallbackSeconds, } from '@/lib/billing/execution-timeout-defaults' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { setOrgMemberUsageLimit } from '@/lib/billing/organizations/member-limits' import { acquireOrganizationMutationLock, diff --git a/apps/sim/lib/admin/member-operation.test.ts b/apps/sim/lib/admin/member-operation.test.ts index efe43489095..5443a8f04b5 100644 --- a/apps/sim/lib/admin/member-operation.test.ts +++ b/apps/sim/lib/admin/member-operation.test.ts @@ -21,7 +21,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/organizations/member-limits', () => organizationMemberLimitsMock) vi.mock('@/lib/billing/organizations/seats', () => organizationSeatsMock) vi.mock('@/lib/billing/core/usage', () => billingUsageMock) diff --git a/apps/sim/lib/admin/member-operation.ts b/apps/sim/lib/admin/member-operation.ts index 3d5d431f4c6..6f2008b120b 100644 --- a/apps/sim/lib/admin/member-operation.ts +++ b/apps/sim/lib/admin/member-operation.ts @@ -7,7 +7,7 @@ import { and, count, desc, eq, inArray, sql } from 'drizzle-orm' import { z } from 'zod' import { ADMIN_MEMBER_OPERATION_EVENT_TYPE } from '@/lib/admin/member-operation-event' import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { setOrgMemberUsageLimit } from '@/lib/billing/organizations/member-limits' import { acquireOrganizationMutationLock, diff --git a/apps/sim/lib/api-key/application/create-api-key.ts b/apps/sim/lib/api-key/application/create-api-key.ts index cfd659b1174..4ea3c77aaf5 100644 --- a/apps/sim/lib/api-key/application/create-api-key.ts +++ b/apps/sim/lib/api-key/application/create-api-key.ts @@ -4,7 +4,7 @@ import { apiKeyOperations } from '@/lib/api-key/application/operations' import { performCreateWorkspaceApiKey } from '@/lib/api-key/orchestration' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface CreateCopilotWorkspaceApiKeyInput { workspaceId: string diff --git a/apps/sim/lib/api-key/application/organization-byok-keys.test.ts b/apps/sim/lib/api-key/application/organization-byok-keys.test.ts index 9003c3a3d4c..5784de0be2f 100644 --- a/apps/sim/lib/api-key/application/organization-byok-keys.test.ts +++ b/apps/sim/lib/api-key/application/organization-byok-keys.test.ts @@ -34,7 +34,7 @@ vi.mock('@/lib/api-key/byok-entitlement', () => ({ isOrganizationBYOKEntitled: isEntitled, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/api-key/application/organization-byok-keys.ts b/apps/sim/lib/api-key/application/organization-byok-keys.ts index 63477770349..684cff0e320 100644 --- a/apps/sim/lib/api-key/application/organization-byok-keys.ts +++ b/apps/sim/lib/api-key/application/organization-byok-keys.ts @@ -28,7 +28,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption' import { acquireAdvisoryXactLock } from '@/lib/db/advisory-locks' import { captureServerEvent } from '@/lib/posthog/server' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import type { BYOKProviderId } from '@/tools/types' const logger = createLogger('OrganizationBYOKKeys') diff --git a/apps/sim/lib/api-key/application/workspace-api-keys.test.ts b/apps/sim/lib/api-key/application/workspace-api-keys.test.ts index 52ce86d514d..ca81780bd4e 100644 --- a/apps/sim/lib/api-key/application/workspace-api-keys.test.ts +++ b/apps/sim/lib/api-key/application/workspace-api-keys.test.ts @@ -13,7 +13,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const hoisted = vi.hoisted(() => ({ display: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/api-key/auth', () => ({ getApiKeyDisplayFormat: hoisted.display })) vi.mock('@sim/audit', () => auditMock) diff --git a/apps/sim/lib/api-key/application/workspace-api-keys.ts b/apps/sim/lib/api-key/application/workspace-api-keys.ts index 7d30ab9c4fb..030757400cd 100644 --- a/apps/sim/lib/api-key/application/workspace-api-keys.ts +++ b/apps/sim/lib/api-key/application/workspace-api-keys.ts @@ -7,7 +7,7 @@ import { getApiKeyDisplayFormat } from '@/lib/api-key/auth' import { defineAuthorizedWorkspaceUseCase, defineWorkspaceOperation } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { captureServerEvent } from '@/lib/posthog/server' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export class WorkspaceApiKeyWorkspaceNotFoundError extends OrchestrationError { constructor() { diff --git a/apps/sim/lib/api-key/application/workspace-byok-keys.test.ts b/apps/sim/lib/api-key/application/workspace-byok-keys.test.ts index 10287c119c9..a8b2fc7b1f8 100644 --- a/apps/sim/lib/api-key/application/workspace-byok-keys.test.ts +++ b/apps/sim/lib/api-key/application/workspace-byok-keys.test.ts @@ -12,7 +12,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' const hoisted = vi.hoisted(() => ({})) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/core/security/encryption', () => encryptionMock) vi.mock('@sim/audit', () => auditMock) diff --git a/apps/sim/lib/api-key/application/workspace-byok-keys.ts b/apps/sim/lib/api-key/application/workspace-byok-keys.ts index 3a93e98a32f..d703eedda71 100644 --- a/apps/sim/lib/api-key/application/workspace-byok-keys.ts +++ b/apps/sim/lib/api-key/application/workspace-byok-keys.ts @@ -10,7 +10,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { decryptSecret } from '@/lib/core/security/encryption' import { captureServerEvent } from '@/lib/posthog/server' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import type { BYOKProviderId } from '@/tools/types' const logger = createLogger('WorkspaceByokKeys') diff --git a/apps/sim/lib/api/contracts/hotspots.ts b/apps/sim/lib/api/contracts/hotspots.ts index 82f24c81734..fa82bd58f2b 100644 --- a/apps/sim/lib/api/contracts/hotspots.ts +++ b/apps/sim/lib/api/contracts/hotspots.ts @@ -9,7 +9,7 @@ import { import { defineRouteContract } from '@/lib/api/contracts/types' import { DEFAULT_CODE_LANGUAGE } from '@/lib/execution/languages' import { PRIVATE_SECRET_PROVENANCE_FIELD } from '@/lib/execution/private-tool-metadata' -import { MAX_BLOCK_MOUNTED_FILES } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { MAX_BLOCK_MOUNTED_FILES } from '@/lib/execution/remote-sandbox/paths' import { MAX_FUNCTION_CODE_LENGTH } from '@/lib/function-execution/limits' import { MAX_PII_VALIDATION_DETECTED_ENTITIES, diff --git a/apps/sim/lib/api/contracts/v2/files.ts b/apps/sim/lib/api/contracts/v2/files.ts index baf8975fc76..cbbe2e7bd26 100644 --- a/apps/sim/lib/api/contracts/v2/files.ts +++ b/apps/sim/lib/api/contracts/v2/files.ts @@ -44,7 +44,7 @@ import { } from '@/lib/api/contracts/v2/uploads' import { MAX_FOLDER_PATH_BYTES, MAX_FOLDER_PATH_SEGMENTS } from '@/lib/folders/paths' import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { MAX_ZIP_DOWNLOAD_FILES } from '@/lib/workspace-files/limits' import { FILE_SEARCH_DEFAULT_MAX_RESULTS, diff --git a/apps/sim/lib/api/server/routes/v2-api-key-auth.test.ts b/apps/sim/lib/api/server/routes/v2-api-key-auth.test.ts index 75a85bc959e..643fa55a99d 100644 --- a/apps/sim/lib/api/server/routes/v2-api-key-auth.test.ts +++ b/apps/sim/lib/api/server/routes/v2-api-key-auth.test.ts @@ -19,7 +19,7 @@ const { updateLastUsed } = vi.hoisted(() => ({ updateLastUsed: vi.fn() })) vi.mock('@/lib/api-key/crypto', () => ({ hashApiKey: (value: string) => `hash:${value}` })) vi.mock('@sim/security/hash', () => ({ sha256Hex: (value: string) => `oauth-hash:${value}` })) vi.mock('@/lib/api-key/service', () => ({ updateApiKeyLastUsed: updateLastUsed })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) import { diff --git a/apps/sim/lib/api/server/routes/v2-api-key-auth.ts b/apps/sim/lib/api/server/routes/v2-api-key-auth.ts index 133d60a9310..655700d71b5 100644 --- a/apps/sim/lib/api/server/routes/v2-api-key-auth.ts +++ b/apps/sim/lib/api/server/routes/v2-api-key-auth.ts @@ -16,7 +16,7 @@ import { type OAuthAccessTokenOptions, verifyOAuthAccessToken, } from '@/lib/auth/oauth-access-token' -import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/billing-attribution' +import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/attribution' import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription' import { isAuthDisabled } from '@/lib/core/config/env-flags' diff --git a/apps/sim/lib/audit-logs/application/authorized-audit-log-use-case.ts b/apps/sim/lib/audit-logs/application/authorized-audit-log-use-case.ts index 37336ef0dc2..e1e20bc1610 100644 --- a/apps/sim/lib/audit-logs/application/authorized-audit-log-use-case.ts +++ b/apps/sim/lib/audit-logs/application/authorized-audit-log-use-case.ts @@ -24,7 +24,7 @@ import { } from '@/lib/core/orchestration/types' import { refuseCapability } from '@/lib/permission-groups/capabilities' import { isCapabilityWithheldForUser } from '@/lib/permission-groups/user-scope.server' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface AuthorizedAuditLogContext { organizationId: string diff --git a/apps/sim/lib/audit-logs/application/audit-log-use-cases.test.ts b/apps/sim/lib/audit-logs/application/use-cases.test.ts similarity index 99% rename from apps/sim/lib/audit-logs/application/audit-log-use-cases.test.ts rename to apps/sim/lib/audit-logs/application/use-cases.test.ts index 4e1c59ed5ea..d54ffc5f026 100644 --- a/apps/sim/lib/audit-logs/application/audit-log-use-cases.test.ts +++ b/apps/sim/lib/audit-logs/application/use-cases.test.ts @@ -35,7 +35,7 @@ const hoisted = vi.hoisted(() => ({ isCapabilityWithheldForUser: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/permission-groups/user-scope.server', () => ({ diff --git a/apps/sim/lib/auth/auth-client.ts b/apps/sim/lib/auth/client.ts similarity index 100% rename from apps/sim/lib/auth/auth-client.ts rename to apps/sim/lib/auth/client.ts diff --git a/apps/sim/lib/auth/sign-out.test.ts b/apps/sim/lib/auth/sign-out.test.ts index 9dbad29e9cf..9a00055a7d6 100644 --- a/apps/sim/lib/auth/sign-out.test.ts +++ b/apps/sim/lib/auth/sign-out.test.ts @@ -2,7 +2,7 @@ import { authClientMock, authClientMockFns } from '@sim/testing/mocks/auth-clien import { beforeEach, describe, expect, it, vi } from 'vitest' const mocks = vi.hoisted(() => ({ clearUserData: vi.fn() })) -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) vi.mock('@/stores', () => ({ clearUserData: mocks.clearUserData })) import { signOutAndRedirect } from '@/lib/auth/sign-out' diff --git a/apps/sim/lib/auth/sign-out.ts b/apps/sim/lib/auth/sign-out.ts index 4f0e4927446..6f7b72f0379 100644 --- a/apps/sim/lib/auth/sign-out.ts +++ b/apps/sim/lib/auth/sign-out.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sim/logger' -import { signOut } from '@/lib/auth/auth-client' +import { signOut } from '@/lib/auth/client' import { clearUserData } from '@/stores' const logger = createLogger('SignOut') diff --git a/apps/sim/lib/auth/social-sign-in.ts b/apps/sim/lib/auth/social-sign-in.ts index 7dc1ff4e6dd..dd146ab9912 100644 --- a/apps/sim/lib/auth/social-sign-in.ts +++ b/apps/sim/lib/auth/social-sign-in.ts @@ -1,4 +1,4 @@ -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { captureClientEvent } from '@/lib/posthog/client' import type { PostHogEventMap } from '@/lib/posthog/events' diff --git a/apps/sim/lib/auth/sso/application/provider-settings.integration.ts b/apps/sim/lib/auth/sso/application/provider-settings.integration.ts index 5c90e64c44a..024cce689d5 100644 --- a/apps/sim/lib/auth/sso/application/provider-settings.integration.ts +++ b/apps/sim/lib/auth/sso/application/provider-settings.integration.ts @@ -37,7 +37,7 @@ describe('Organization SSO administration through API credentials', () => { const schema = await import('@sim/db/schema') const { and, eq, inArray, sql } = await import('drizzle-orm') const providers = await import('@/lib/auth/sso/application/provider-settings') - const requirements = await import('@/lib/auth/sso/application/sso-requirement') + const requirements = await import('@/lib/auth/sso/application/requirement') const primary = await import('@/lib/auth/sso/application/set-primary-provider') const { saveSsoProvider } = await import('@/lib/auth/sso/application/provider-registration') const { presentSsoProvider } = await import('@/lib/api/server/sso-presenters') diff --git a/apps/sim/lib/auth/sso/application/sso-requirement.test.ts b/apps/sim/lib/auth/sso/application/requirement.test.ts similarity index 99% rename from apps/sim/lib/auth/sso/application/sso-requirement.test.ts rename to apps/sim/lib/auth/sso/application/requirement.test.ts index 972b12482f1..52adf824a0f 100644 --- a/apps/sim/lib/auth/sso/application/sso-requirement.test.ts +++ b/apps/sim/lib/auth/sso/application/requirement.test.ts @@ -41,7 +41,7 @@ vi.mock('@/lib/auth/sso-policy', () => ({ isSsoRequiredForOrganization: mockIsRequired, })) -import { readSsoRequirement, setSsoRequirement } from '@/lib/auth/sso/application/sso-requirement' +import { readSsoRequirement, setSsoRequirement } from '@/lib/auth/sso/application/requirement' const mockRecordAudit = authorizedWorkspaceUseCaseMockFns.mockRecordProjectedUseCaseAuditEntries const mockIsEntitled = billingSubscriptionMockFns.mockIsOrganizationFeatureEntitled diff --git a/apps/sim/lib/auth/sso/application/sso-requirement.ts b/apps/sim/lib/auth/sso/application/requirement.ts similarity index 100% rename from apps/sim/lib/auth/sso/application/sso-requirement.ts rename to apps/sim/lib/auth/sso/application/requirement.ts diff --git a/apps/sim/lib/auth/stale-session-recovery.ts b/apps/sim/lib/auth/stale-session-recovery.ts index cbf797b9c70..6605684c909 100644 --- a/apps/sim/lib/auth/stale-session-recovery.ts +++ b/apps/sim/lib/auth/stale-session-recovery.ts @@ -1,7 +1,7 @@ 'use client' import { createLogger } from '@sim/logger' -import { signOut } from '@/lib/auth/auth-client' +import { signOut } from '@/lib/auth/client' import { clearUserData } from '@/stores' const logger = createLogger('StaleSessionRecovery') diff --git a/apps/sim/lib/benchmarks/application/cases.ts b/apps/sim/lib/benchmarks/application/cases.ts index ea17adcd51c..2b80306a43e 100644 --- a/apps/sim/lib/benchmarks/application/cases.ts +++ b/apps/sim/lib/benchmarks/application/cases.ts @@ -26,7 +26,7 @@ import { import { authorizeWorkspaceOperation } from '@/lib/core/application/workspace-authorization' import { OrchestrationError } from '@/lib/core/orchestration/types' import { workflowDelegationPolicy } from '@/lib/workflows/application/authorization' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' interface BenchmarkInput { organizationId: string diff --git a/apps/sim/lib/benchmarks/worker.ts b/apps/sim/lib/benchmarks/worker.ts index 1fe530aabd5..86a86e18a94 100644 --- a/apps/sim/lib/benchmarks/worker.ts +++ b/apps/sim/lib/benchmarks/worker.ts @@ -14,7 +14,7 @@ import type { BenchmarkCase } from '@/lib/benchmarks/types' import { resolveBillingAttribution, resolveOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { prepareCopilotEnvironmentContext } from '@/lib/mothership/environment-context' import type { diff --git a/apps/sim/lib/billing/application/authorized-billing-read-use-case.ts b/apps/sim/lib/billing/application/authorized-billing-read-use-case.ts index 7663281949a..6d2f2561d04 100644 --- a/apps/sim/lib/billing/application/authorized-billing-read-use-case.ts +++ b/apps/sim/lib/billing/application/authorized-billing-read-use-case.ts @@ -29,7 +29,7 @@ import { isCapabilityWithheldForUser } from '@/lib/permission-groups/user-scope. import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export type BillingReadScope = | { kind: 'account'; userId: string } diff --git a/apps/sim/lib/billing/application/get-billing-status.ts b/apps/sim/lib/billing/application/get-billing-status.ts index 719d5b9ffc4..b11b3bee4b1 100644 --- a/apps/sim/lib/billing/application/get-billing-status.ts +++ b/apps/sim/lib/billing/application/get-billing-status.ts @@ -11,7 +11,7 @@ import { resolveBillingAttribution, resolveSystemBillingAttribution, toUsageLimitSubscription, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import type { HighestPrioritySubscription } from '@/lib/billing/core/plan' import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription' import { type BillingEntity, deriveBillingContext } from '@/lib/billing/core/usage-log' diff --git a/apps/sim/lib/billing/application/organization-usage/organization-usage-use-cases.test.ts b/apps/sim/lib/billing/application/organization-usage/use-cases.test.ts similarity index 100% rename from apps/sim/lib/billing/application/organization-usage/organization-usage-use-cases.test.ts rename to apps/sim/lib/billing/application/organization-usage/use-cases.test.ts diff --git a/apps/sim/lib/billing/application/billing-use-cases.test.ts b/apps/sim/lib/billing/application/use-cases.test.ts similarity index 99% rename from apps/sim/lib/billing/application/billing-use-cases.test.ts rename to apps/sim/lib/billing/application/use-cases.test.ts index 8ed4b493820..214ef0edd30 100644 --- a/apps/sim/lib/billing/application/billing-use-cases.test.ts +++ b/apps/sim/lib/billing/application/use-cases.test.ts @@ -55,11 +55,11 @@ vi.mock('@/lib/billing/core/workspace-billing-authority', () => ({ canUserManageBillingEntity: hoisted.canUserManageBillingEntity, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/calculations/usage-monitor', () => billingUsageMonitorMock) diff --git a/apps/sim/lib/billing/client/upgrade.ts b/apps/sim/lib/billing/client/upgrade.ts index c03a1f4a082..cebbda9249f 100644 --- a/apps/sim/lib/billing/client/upgrade.ts +++ b/apps/sim/lib/billing/client/upgrade.ts @@ -7,7 +7,7 @@ import { ApiClientError } from '@/lib/api/client/errors' import { requestJson } from '@/lib/api/client/request' import { listCreatorOrganizationsContract } from '@/lib/api/contracts/organizations' import { subscriptionTransferContract } from '@/lib/api/contracts/user' -import { client, useSession, useSubscription } from '@/lib/auth/auth-client' +import { client, useSession, useSubscription } from '@/lib/auth/client' import { buildPlanName, getDisplayPlanName, isPaid } from '@/lib/billing/plan-helpers' import { hasPaidSubscriptionStatus } from '@/lib/billing/subscriptions/utils' import { organizationKeys } from '@/hooks/queries/organization' diff --git a/apps/sim/lib/billing/core/billing-attribution.test.ts b/apps/sim/lib/billing/core/attribution.test.ts similarity index 99% rename from apps/sim/lib/billing/core/billing-attribution.test.ts rename to apps/sim/lib/billing/core/attribution.test.ts index f4b50be40f1..b67782b5f22 100644 --- a/apps/sim/lib/billing/core/billing-attribution.test.ts +++ b/apps/sim/lib/billing/core/attribution.test.ts @@ -29,7 +29,7 @@ import { resolveLegacyV0BillingAttribution, serializeBillingAttributionHeader, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' const { mockCheckBillingBlocked, diff --git a/apps/sim/lib/billing/core/billing-attribution.ts b/apps/sim/lib/billing/core/attribution.ts similarity index 100% rename from apps/sim/lib/billing/core/billing-attribution.ts rename to apps/sim/lib/billing/core/attribution.ts diff --git a/apps/sim/lib/billing/core/mid-run-usage.ts b/apps/sim/lib/billing/core/mid-run-usage.ts index 96393ba26bc..3db0c1d342d 100644 --- a/apps/sim/lib/billing/core/mid-run-usage.ts +++ b/apps/sim/lib/billing/core/mid-run-usage.ts @@ -2,14 +2,14 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { LRUCache } from 'lru-cache' import { checkUsageStatus } from '@/lib/billing/calculations/usage-monitor' -import { getOrganizationSubscription } from '@/lib/billing/core/billing' import { type AccountBillingDecision, type AttributedUsageLimitsResult, type BillingAttributionSnapshot, checkAccountBillingBlocks, refreshAttributionPeriod, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' +import { getOrganizationSubscription } from '@/lib/billing/core/billing' import { defaultBillingPeriod } from '@/lib/billing/core/billing-period' import { getHighestPriorityPersonalSubscription } from '@/lib/billing/core/plan' import { resolveSubscriptionUsagePeriod } from '@/lib/billing/core/reporting-period' diff --git a/apps/sim/lib/billing/core/usage-gate-cache.test.ts b/apps/sim/lib/billing/core/usage-gate-cache.test.ts index 6c41e48598b..79f35c65b3b 100644 --- a/apps/sim/lib/billing/core/usage-gate-cache.test.ts +++ b/apps/sim/lib/billing/core/usage-gate-cache.test.ts @@ -7,9 +7,9 @@ import { import { sleep } from '@sim/utils/helpers' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits, checkIngestionUsageLimits, diff --git a/apps/sim/lib/billing/core/usage-gate-cache.ts b/apps/sim/lib/billing/core/usage-gate-cache.ts index a520220b3bf..230cf09e7d7 100644 --- a/apps/sim/lib/billing/core/usage-gate-cache.ts +++ b/apps/sim/lib/billing/core/usage-gate-cache.ts @@ -4,7 +4,7 @@ import { type AttributedUsageLimitsResult, type BillingAttributionSnapshot, checkAttributedUsageLimits, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { coalesceLocally } from '@/lib/concurrency/singleflight' /** diff --git a/apps/sim/lib/billing/core/workspace-access.test.ts b/apps/sim/lib/billing/core/workspace-access.test.ts index 7a8bb782dce..ced3a429183 100644 --- a/apps/sim/lib/billing/core/workspace-access.test.ts +++ b/apps/sim/lib/billing/core/workspace-access.test.ts @@ -8,7 +8,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/billing/core/access', () => billingAccessMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) diff --git a/apps/sim/lib/billing/core/workspace-access.ts b/apps/sim/lib/billing/core/workspace-access.ts index 2470c4a866c..206d011a91a 100644 --- a/apps/sim/lib/billing/core/workspace-access.ts +++ b/apps/sim/lib/billing/core/workspace-access.ts @@ -1,5 +1,5 @@ import { getBillingEntityBlockStatus } from '@/lib/billing/core/access' -import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/billing-attribution' +import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/attribution' import { resolveBillingInterval } from '@/lib/billing/core/subscription' import { isEnterprise, isPaid, isPro, isTeam } from '@/lib/billing/plan-helpers' import { hasPaidSubscriptionStatus } from '@/lib/billing/subscriptions/utils' diff --git a/apps/sim/lib/billing/core/workspace-usage-gate.test.ts b/apps/sim/lib/billing/core/workspace-usage-gate.test.ts index 0f1b575b723..305fe9ad2a0 100644 --- a/apps/sim/lib/billing/core/workspace-usage-gate.test.ts +++ b/apps/sim/lib/billing/core/workspace-usage-gate.test.ts @@ -4,7 +4,7 @@ import { } from '@sim/testing/mocks/billing-attribution.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { checkWorkspaceUsageGate, diff --git a/apps/sim/lib/billing/core/workspace-usage-gate.ts b/apps/sim/lib/billing/core/workspace-usage-gate.ts index b9495fda908..393ef03c976 100644 --- a/apps/sim/lib/billing/core/workspace-usage-gate.ts +++ b/apps/sim/lib/billing/core/workspace-usage-gate.ts @@ -1,7 +1,7 @@ import { checkAttributedUsageLimits, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { getPooledCreditsRemaining } from '@/lib/billing/on-demand' export interface WorkspaceUsageGateParams { diff --git a/apps/sim/lib/billing/enterprise-owner-claim.test.ts b/apps/sim/lib/billing/enterprise-owner-claim.test.ts index 1e064a52c12..8ec60bd47d4 100644 --- a/apps/sim/lib/billing/enterprise-owner-claim.test.ts +++ b/apps/sim/lib/billing/enterprise-owner-claim.test.ts @@ -43,7 +43,7 @@ vi.mock('@/lib/billing/enterprise-provisioning', () => { retryEnterpriseProvisioning: hoisted.retryProvisioning, } }) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/organizations/create-organization', () => ({ createOrganizationWithOwnerTx: hoisted.createOrganization, })) diff --git a/apps/sim/lib/billing/enterprise-owner-claim.ts b/apps/sim/lib/billing/enterprise-owner-claim.ts index 539547dca4b..6358454ed9b 100644 --- a/apps/sim/lib/billing/enterprise-owner-claim.ts +++ b/apps/sim/lib/billing/enterprise-owner-claim.ts @@ -24,8 +24,8 @@ import { retryEnterpriseProvisioning, } from '@/lib/billing/enterprise-provisioning' import { parseWorkflowExecutionTimeoutSeconds } from '@/lib/billing/execution-timeout-defaults' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' import { createOrganizationWithOwnerTx } from '@/lib/billing/organizations/create-organization' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { enqueueOutboxEvent, type OutboxHandler, diff --git a/apps/sim/lib/billing/enterprise-provisioning.test.ts b/apps/sim/lib/billing/enterprise-provisioning.test.ts index 8ca42609d5b..840f2c6a441 100644 --- a/apps/sim/lib/billing/enterprise-provisioning.test.ts +++ b/apps/sim/lib/billing/enterprise-provisioning.test.ts @@ -37,7 +37,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/utils/id', () => idMock) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/stripe-client', () => stripeClientMock) vi.mock('@/lib/billing/webhooks/enterprise-reconciliation-lease', () => ({ withEnterpriseReconciliationLease: vi.fn(async (_id: string, operation: () => Promise) => diff --git a/apps/sim/lib/billing/enterprise-provisioning.ts b/apps/sim/lib/billing/enterprise-provisioning.ts index cc3962f5a79..93620a470d9 100644 --- a/apps/sim/lib/billing/enterprise-provisioning.ts +++ b/apps/sim/lib/billing/enterprise-provisioning.ts @@ -67,7 +67,7 @@ import { parseWorkflowExecutionTimeoutSeconds, resolveEnterpriseWorkflowExecutionTimeoutFallbackSeconds, } from '@/lib/billing/execution-timeout-defaults' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { acquireOrganizationMutationLock, reapplyPaidOrgJoinBillingForExistingMemberTx, diff --git a/apps/sim/lib/billing/organization.test.ts b/apps/sim/lib/billing/organization.test.ts index fdc9275c5b4..f23ce7f0321 100644 --- a/apps/sim/lib/billing/organization.test.ts +++ b/apps/sim/lib/billing/organization.test.ts @@ -47,7 +47,7 @@ vi.mock('@/lib/billing/organizations/create-organization', () => ({ })) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/billing/enterprise-outbox', () => ({ assertNoCompetingEnterpriseIssuance: mockAssertNoCompetingEnterpriseIssuance, diff --git a/apps/sim/lib/billing/organization.ts b/apps/sim/lib/billing/organization.ts index 637beabf1f2..7683cbcb35b 100644 --- a/apps/sim/lib/billing/organization.ts +++ b/apps/sim/lib/billing/organization.ts @@ -8,8 +8,8 @@ import { getPlanPricing, isSubscriptionOrgScoped } from '@/lib/billing/core/bill import { getOrganizationIdForSubscriptionReference } from '@/lib/billing/core/subscription' import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage' import { assertNoCompetingEnterpriseIssuance } from '@/lib/billing/enterprise-outbox' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' import { createOrganizationWithOwner } from '@/lib/billing/organizations/create-organization' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { acquireOrganizationMutationLock } from '@/lib/billing/organizations/membership' import { isEnterprise, isOrgPlan, isPaid } from '@/lib/billing/plan-helpers' import { SubscriptionReferenceNotFoundError } from '@/lib/billing/subscriptions/errors' diff --git a/apps/sim/lib/billing/organizations/create-organization.ts b/apps/sim/lib/billing/organizations/create-organization.ts index 41eaf6f600d..351d4e22a51 100644 --- a/apps/sim/lib/billing/organizations/create-organization.ts +++ b/apps/sim/lib/billing/organizations/create-organization.ts @@ -2,7 +2,7 @@ import { db } from '@sim/db' import { member, organization } from '@sim/db/schema' import { generateId } from '@sim/utils/id' import { and, eq, ne } from 'drizzle-orm' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import type { DbTransaction } from '@/lib/db/types' const ORGANIZATION_SLUG_REGEX = /^[a-z0-9-_]+$/ diff --git a/apps/sim/lib/billing/organizations/billing-identity-lock.ts b/apps/sim/lib/billing/organizations/identity-lock.ts similarity index 100% rename from apps/sim/lib/billing/organizations/billing-identity-lock.ts rename to apps/sim/lib/billing/organizations/identity-lock.ts diff --git a/apps/sim/lib/billing/organizations/membership.ts b/apps/sim/lib/billing/organizations/membership.ts index 5092c8badc3..aa54a173b42 100644 --- a/apps/sim/lib/billing/organizations/membership.ts +++ b/apps/sim/lib/billing/organizations/membership.ts @@ -34,7 +34,7 @@ import { assertNoUnresolvedEnterpriseIssuance, resolveEnterpriseMetadataIntent, } from '@/lib/billing/enterprise-outbox' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { setOrgMemberUsageLimit } from '@/lib/billing/organizations/member-limits' import { MEMBER_BILLING_RECONCILIATION_EVENT_TYPE } from '@/lib/billing/organizations/membership-reconciliation-event' import { reassignOrganizationSharedResourcesTx } from '@/lib/billing/organizations/resource-handoff' @@ -74,7 +74,7 @@ import { reassignSharedResourceOwnershipForWorkspaceMemberRemovalTx } from '@/li import { WorkspaceBillingAccountRemovalError } from '@/lib/workspaces/utils' import { endDirectoryMembershipTx } from '@/ee/scim/lib/identity/end-directory-membership' -export { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +export { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' export { WORKSPACE_BILLING_ACCOUNT_REMOVAL_ERROR } from '@/lib/workspaces/utils' const logger = createLogger('OrganizationMembership') diff --git a/apps/sim/lib/billing/storage/context.test.ts b/apps/sim/lib/billing/storage/context.test.ts index e28c8cdd173..ef03fb6f567 100644 --- a/apps/sim/lib/billing/storage/context.test.ts +++ b/apps/sim/lib/billing/storage/context.test.ts @@ -4,7 +4,7 @@ import { } from '@sim/testing/mocks/billing-attribution.mock' import { describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { resolveStorageBillingContext } from '@/lib/billing/storage/context' diff --git a/apps/sim/lib/billing/storage/context.ts b/apps/sim/lib/billing/storage/context.ts index b42986fc53f..55cb7e3d956 100644 --- a/apps/sim/lib/billing/storage/context.ts +++ b/apps/sim/lib/billing/storage/context.ts @@ -2,8 +2,8 @@ import { db } from '@sim/db' import { member } from '@sim/db/schema' import { isRecordLike } from '@sim/utils/object' import { and, eq } from 'drizzle-orm' +import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/attribution' import { getOrganizationSubscription } from '@/lib/billing/core/billing' -import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/billing-attribution' import { getHighestPriorityPersonalSubscription } from '@/lib/billing/core/subscription' import type { BillingEntity } from '@/lib/billing/core/usage-log' import type { DbOrTx } from '@/lib/db/types' diff --git a/apps/sim/lib/billing/usage-upgrade.ts b/apps/sim/lib/billing/usage-upgrade.ts index ceee5e1fe9e..37fe1e6dbae 100644 --- a/apps/sim/lib/billing/usage-upgrade.ts +++ b/apps/sim/lib/billing/usage-upgrade.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import type { UsageUpgradePayload } from '@/lib/api/contracts/subscription' -import type { AttributedUsageLimitsResult } from '@/lib/billing/core/billing-attribution' +import type { AttributedUsageLimitsResult } from '@/lib/billing/core/attribution' import { getHighestPrioritySubscription } from '@/lib/billing/core/plan' import type { BillingEntity } from '@/lib/billing/core/usage-log' import { isEnterprise, isPaid } from '@/lib/billing/plan-helpers' diff --git a/apps/sim/lib/browser-agent/application/browser-file-transfer.ts b/apps/sim/lib/browser-agent/application/browser-file-transfer.ts index 90dfa6708b0..9d5c95be1e7 100644 --- a/apps/sim/lib/browser-agent/application/browser-file-transfer.ts +++ b/apps/sim/lib/browser-agent/application/browser-file-transfer.ts @@ -13,7 +13,7 @@ import { loadActiveWorkspaceContext, type WorkspaceFileRecord, } from '@/lib/uploads/contexts/workspace' -import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' import { createAuthorizedWorkspaceFile, diff --git a/apps/sim/lib/catalog/application/catalog-context.ts b/apps/sim/lib/catalog/application/context.ts similarity index 99% rename from apps/sim/lib/catalog/application/catalog-context.ts rename to apps/sim/lib/catalog/application/context.ts index 7d28de854f9..460828edcfa 100644 --- a/apps/sim/lib/catalog/application/catalog-context.ts +++ b/apps/sim/lib/catalog/application/context.ts @@ -12,7 +12,7 @@ import { import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' import { type CustomBlockOverlayRow, withCustomBlockOverlay } from '@/blocks/custom/server-overlay' import type { BlockConfig } from '@/blocks/types' import { isHiddenUnder } from '@/blocks/visibility/context' diff --git a/apps/sim/lib/catalog/application/get-block.ts b/apps/sim/lib/catalog/application/get-block.ts index 910bccbcc00..1d186ac3231 100644 --- a/apps/sim/lib/catalog/application/get-block.ts +++ b/apps/sim/lib/catalog/application/get-block.ts @@ -4,7 +4,7 @@ import { loadCatalogWorkspaceContext, resolveCatalogGate, withCatalogBlockScope, -} from '@/lib/catalog/application/catalog-context' +} from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { type CatalogBlockDetail, projectBlockDetail } from '@/lib/catalog/projection/block-detail' import { getContainerBlockDetail } from '@/lib/catalog/projection/container-blocks' diff --git a/apps/sim/lib/catalog/application/get-tool.ts b/apps/sim/lib/catalog/application/get-tool.ts index 2a92caf0f08..c05bd4ed313 100644 --- a/apps/sim/lib/catalog/application/get-tool.ts +++ b/apps/sim/lib/catalog/application/get-tool.ts @@ -1,8 +1,5 @@ import { catalogDelegationPolicy } from '@/lib/catalog/application/authorization' -import { - loadCatalogWorkspaceContext, - resolveCatalogGate, -} from '@/lib/catalog/application/catalog-context' +import { loadCatalogWorkspaceContext, resolveCatalogGate } from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { resolveVisibleToolId, resolveVisibleToolIds } from '@/lib/catalog/application/tool-scope' import { type CatalogToolDetail, projectToolDetail } from '@/lib/catalog/projection/tool' diff --git a/apps/sim/lib/catalog/application/list-blocks.ts b/apps/sim/lib/catalog/application/list-blocks.ts index 4833f8a6ad6..f12501be11b 100644 --- a/apps/sim/lib/catalog/application/list-blocks.ts +++ b/apps/sim/lib/catalog/application/list-blocks.ts @@ -1,11 +1,5 @@ import type { V2SortOrder } from '@/lib/api/contracts/v2/shared' import { catalogDelegationPolicy } from '@/lib/catalog/application/authorization' -import { - isBlockVisibleToCaller, - loadCatalogWorkspaceContext, - resolveCatalogGate, - withCatalogBlockScope, -} from '@/lib/catalog/application/catalog-context' import { type CatalogPage, matchesCatalogSearch, @@ -13,6 +7,12 @@ import { sortCatalogEntries, takeCatalogPage, } from '@/lib/catalog/application/catalog-page' +import { + isBlockVisibleToCaller, + loadCatalogWorkspaceContext, + resolveCatalogGate, + withCatalogBlockScope, +} from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { type CatalogBlockSummary, diff --git a/apps/sim/lib/catalog/application/list-connector-types.ts b/apps/sim/lib/catalog/application/list-connector-types.ts index 401b6768380..280ae8a6bfc 100644 --- a/apps/sim/lib/catalog/application/list-connector-types.ts +++ b/apps/sim/lib/catalog/application/list-connector-types.ts @@ -1,12 +1,12 @@ import type { V2ConnectorTypeDetail } from '@/lib/api/contracts/v2/catalog' import { catalogDelegationPolicy } from '@/lib/catalog/application/authorization' -import { loadCatalogWorkspaceContext } from '@/lib/catalog/application/catalog-context' import { type CatalogPage, matchesCatalogSearch, normalizeCatalogSearch, takeCatalogPage, } from '@/lib/catalog/application/catalog-page' +import { loadCatalogWorkspaceContext } from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { type CatalogConnectorType, diff --git a/apps/sim/lib/catalog/application/list-registries.test.ts b/apps/sim/lib/catalog/application/list-registries.test.ts index eb173ec0d2c..d5701c740f6 100644 --- a/apps/sim/lib/catalog/application/list-registries.test.ts +++ b/apps/sim/lib/catalog/application/list-registries.test.ts @@ -7,7 +7,7 @@ import { } from '@sim/testing/mocks/workspace-context.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/catalog/application/list-tools.ts b/apps/sim/lib/catalog/application/list-tools.ts index 6fb7bd97680..e9070de0977 100644 --- a/apps/sim/lib/catalog/application/list-tools.ts +++ b/apps/sim/lib/catalog/application/list-tools.ts @@ -1,9 +1,5 @@ import type { V2SortOrder } from '@/lib/api/contracts/v2/shared' import { catalogDelegationPolicy } from '@/lib/catalog/application/authorization' -import { - loadCatalogWorkspaceContext, - resolveCatalogGate, -} from '@/lib/catalog/application/catalog-context' import { type CatalogPage, matchesCatalogSearch, @@ -11,6 +7,7 @@ import { sortCatalogEntries, takeCatalogPage, } from '@/lib/catalog/application/catalog-page' +import { loadCatalogWorkspaceContext, resolveCatalogGate } from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { resolveVisibleToolIds } from '@/lib/catalog/application/tool-scope' import { type CatalogToolSummary, projectToolSummaryById } from '@/lib/catalog/projection/tool' diff --git a/apps/sim/lib/catalog/application/read-block-catalog.ts b/apps/sim/lib/catalog/application/read-block-catalog.ts index 78163e2a373..da4fe783540 100644 --- a/apps/sim/lib/catalog/application/read-block-catalog.ts +++ b/apps/sim/lib/catalog/application/read-block-catalog.ts @@ -1,11 +1,11 @@ import { catalogDelegationPolicy } from '@/lib/catalog/application/authorization' +import { sortCatalogEntries } from '@/lib/catalog/application/catalog-page' import { isBlockVisibleToCaller, loadCatalogWorkspaceContext, resolveCatalogGate, withCatalogBlockScope, -} from '@/lib/catalog/application/catalog-context' -import { sortCatalogEntries } from '@/lib/catalog/application/catalog-page' +} from '@/lib/catalog/application/context' import { catalogOperations } from '@/lib/catalog/application/operations' import { projectBlockDetail } from '@/lib/catalog/projection/block-detail' import { CONTAINER_BLOCK_DETAILS } from '@/lib/catalog/projection/container-blocks' diff --git a/apps/sim/lib/catalog/application/catalog-reads.test.ts b/apps/sim/lib/catalog/application/reads.test.ts similarity index 99% rename from apps/sim/lib/catalog/application/catalog-reads.test.ts rename to apps/sim/lib/catalog/application/reads.test.ts index 1869e253f93..4b1cbdf39a1 100644 --- a/apps/sim/lib/catalog/application/catalog-reads.test.ts +++ b/apps/sim/lib/catalog/application/reads.test.ts @@ -24,7 +24,7 @@ const hoisted = vi.hoisted(() => ({ allowedIntegrationTypes: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/catalog/application/tool-scope.ts b/apps/sim/lib/catalog/application/tool-scope.ts index 71e05b76b88..34f4904fcc9 100644 --- a/apps/sim/lib/catalog/application/tool-scope.ts +++ b/apps/sim/lib/catalog/application/tool-scope.ts @@ -2,7 +2,7 @@ import { type CatalogGate, isBlockVisibleToCaller, withCatalogBlockScope, -} from '@/lib/catalog/application/catalog-context' +} from '@/lib/catalog/application/context' import { getAllBlocks } from '@/blocks/registry' import { resolveToolId } from '@/tools/tool-ids' diff --git a/apps/sim/lib/catalog/projection/projection-invariants.test.ts b/apps/sim/lib/catalog/projection/invariants.test.ts similarity index 100% rename from apps/sim/lib/catalog/projection/projection-invariants.test.ts rename to apps/sim/lib/catalog/projection/invariants.test.ts diff --git a/apps/sim/lib/catalog/projection/catalog-sweep.test.ts b/apps/sim/lib/catalog/projection/sweep.test.ts similarity index 100% rename from apps/sim/lib/catalog/projection/catalog-sweep.test.ts rename to apps/sim/lib/catalog/projection/sweep.test.ts diff --git a/apps/sim/lib/changelog/application/availability.ts b/apps/sim/lib/changelog/application/availability.ts index 69b307ab711..1472258d501 100644 --- a/apps/sim/lib/changelog/application/availability.ts +++ b/apps/sim/lib/changelog/application/availability.ts @@ -1,6 +1,6 @@ import { isChangelogEnabled } from '@/lib/changelog/feature-flag' import { defineAuthorizedWorkspaceUseCase, defineWorkspaceOperation } from '@/lib/core/application' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** permission-group-exempt: reports rollout availability only; changelog operations enforce files.use. */ const availabilityOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/changelog/application/changelog.ts b/apps/sim/lib/changelog/application/changelog.ts index 44941a6f243..860d8b17848 100644 --- a/apps/sim/lib/changelog/application/changelog.ts +++ b/apps/sim/lib/changelog/application/changelog.ts @@ -27,8 +27,8 @@ import { } from '@/lib/changelog/version' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { createOwnedWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { createOwnedWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const authorizationOptions = { delegation: { audience: 'sim:workspaces', isWithinScope: () => true }, diff --git a/apps/sim/lib/charts/summary.test.ts b/apps/sim/lib/charts/summary.test.ts index 8fabac411a9..bb9f80eb313 100644 --- a/apps/sim/lib/charts/summary.test.ts +++ b/apps/sim/lib/charts/summary.test.ts @@ -8,7 +8,7 @@ import { summarizeChart, } from '@/lib/charts/summary' import { bindTimeSeriesInteractions, type ChartReadout } from '@/lib/charts/time-series' -import { createDashboardCursorStore } from '@/stores/dashboards/cursor' +import { createDashboardCursorStore } from '@/stores/dashboards/cursor/store' echarts.setPlatformAPI({ measureText: (text) => ({ width: String(text).length * 6 }) }) echarts.use(chartSummaryExtension) diff --git a/apps/sim/lib/charts/time-series.test.ts b/apps/sim/lib/charts/time-series.test.ts index 1c31f849f9a..c863bd9c322 100644 --- a/apps/sim/lib/charts/time-series.test.ts +++ b/apps/sim/lib/charts/time-series.test.ts @@ -2,7 +2,7 @@ import type { EChartsType } from 'echarts' import { describe, expect, it, vi } from 'vitest' import { bindTimeSeriesInteractions, readTimeSeriesTooltip } from '@/lib/charts/time-series' -import { createDashboardCursorStore } from '@/stores/dashboards/cursor' +import { createDashboardCursorStore } from '@/stores/dashboards/cursor/store' const range = { from: '2026-09-20T00:00:00.000Z', to: '2026-09-22T00:00:00.000Z' } const time = Date.parse('2026-09-21T00:00:00Z') diff --git a/apps/sim/lib/charts/time-series.ts b/apps/sim/lib/charts/time-series.ts index 06b9b5e7cf2..fd97a75cfa9 100644 --- a/apps/sim/lib/charts/time-series.ts +++ b/apps/sim/lib/charts/time-series.ts @@ -8,7 +8,7 @@ import { dashboardTimeLabel, dashboardZoomRange, } from '@/lib/dashboards/time' -import type { DashboardCursorStore } from '@/stores/dashboards/cursor' +import type { DashboardCursorStore } from '@/stores/dashboards/cursor/store' export interface ChartReadoutValue { name: string diff --git a/apps/sim/lib/chat-deployments/application/context.ts b/apps/sim/lib/chat-deployments/application/context.ts index 3345a64d668..29b64edf281 100644 --- a/apps/sim/lib/chat-deployments/application/context.ts +++ b/apps/sim/lib/chat-deployments/application/context.ts @@ -12,7 +12,7 @@ import { import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export const CHAT_DEPLOYMENT_NOT_FOUND_MESSAGE = 'Chat deployment not found' diff --git a/apps/sim/lib/chat-deployments/application/read-chat-deployments.ts b/apps/sim/lib/chat-deployments/application/read-chat-deployments.ts index 19b801f28e0..d16f32a7b36 100644 --- a/apps/sim/lib/chat-deployments/application/read-chat-deployments.ts +++ b/apps/sim/lib/chat-deployments/application/read-chat-deployments.ts @@ -11,7 +11,7 @@ import { listWorkspaceChatDeployments, } from '@/lib/chat-deployments/queries' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** * Chat deployments carry an encrypted password. It is stripped here, once, so diff --git a/apps/sim/lib/cleanup/chat-cleanup.ts b/apps/sim/lib/cleanup/chat-cleanup.ts index f537f41f808..9aaa8c41bba 100644 --- a/apps/sim/lib/cleanup/chat-cleanup.ts +++ b/apps/sim/lib/cleanup/chat-cleanup.ts @@ -13,7 +13,7 @@ import { detoastedMessageContent, textMessageContent } from '@/lib/mothership/ch import { SIM_AGENT_API_URL } from '@/lib/mothership/constants' import type { StorageContext } from '@/lib/uploads' import { isUsingCloudStorage, StorageService } from '@/lib/uploads' -import { tryInferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { tryInferContextFromKey } from '@/lib/uploads/utils/file' const logger = createLogger('ChatCleanup') diff --git a/apps/sim/lib/collab-doc/persist.test.ts b/apps/sim/lib/collab-doc/persist.test.ts index dac0752944a..1fb521e91eb 100644 --- a/apps/sim/lib/collab-doc/persist.test.ts +++ b/apps/sim/lib/collab-doc/persist.test.ts @@ -6,7 +6,7 @@ import { } from '@sim/testing/mocks/workspace-uploads.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' import * as Y from 'yjs' -import * as collabState from '@/lib/collab-doc/collab-state' +import * as collabState from '@/lib/collab-doc/state' const { mockGetWorkspaceFile, @@ -23,10 +23,10 @@ beforeEach(() => { vi.spyOn(collabState, 'commitCollabDocState').mockImplementation(mockCommitState) }) -import type { CachedCollabDocState, PreparedCollabDocState } from '@/lib/collab-doc/collab-state' import { applyMarkdownToYDoc, markdownToYDoc, yDocToFileMarkdown } from '@/lib/collab-doc/converter' import { COLLAB_DOC_FIELD } from '@/lib/collab-doc/field' import { persistFileDoc } from '@/lib/collab-doc/persist' +import type { CachedCollabDocState, PreparedCollabDocState } from '@/lib/collab-doc/state' const VERSION = new Date('2026-01-01T00:00:00.000Z') diff --git a/apps/sim/lib/collab-doc/persist.ts b/apps/sim/lib/collab-doc/persist.ts index eec7af8dc97..e894baad0da 100644 --- a/apps/sim/lib/collab-doc/persist.ts +++ b/apps/sim/lib/collab-doc/persist.ts @@ -1,6 +1,7 @@ import { createLogger } from '@sim/logger' import { FILE_DOC_SEED } from '@sim/realtime-protocol/file-doc' import * as Y from 'yjs' +import { yDocToFileMarkdown } from '@/lib/collab-doc/converter' import { assertCollabDocStateSize, type CachedCollabDocState, @@ -9,8 +10,7 @@ import { hashMarkdown, loadCollabDocState, type PreparedCollabDocState, -} from '@/lib/collab-doc/collab-state' -import { yDocToFileMarkdown } from '@/lib/collab-doc/converter' +} from '@/lib/collab-doc/state' import { ContentVersionConflictError, fetchWorkspaceFileBuffer, diff --git a/apps/sim/lib/collab-doc/seed.test.ts b/apps/sim/lib/collab-doc/seed.test.ts index 4fb6bf7b969..c650f922e74 100644 --- a/apps/sim/lib/collab-doc/seed.test.ts +++ b/apps/sim/lib/collab-doc/seed.test.ts @@ -7,7 +7,7 @@ import { getSchema } from '@tiptap/core' import { prosemirrorJSONToYDoc } from '@tiptap/y-tiptap' import { beforeEach, describe, expect, it, vi } from 'vitest' import * as Y from 'yjs' -import * as collabState from '@/lib/collab-doc/collab-state' +import * as collabState from '@/lib/collab-doc/state' const { mockGetWorkspaceFile, mockFetchWorkspaceFileBuffer: mockFetchBuffer } = workspaceUploadsMockFns diff --git a/apps/sim/lib/collab-doc/seed.ts b/apps/sim/lib/collab-doc/seed.ts index 00456bb5918..b9685eaaca6 100644 --- a/apps/sim/lib/collab-doc/seed.ts +++ b/apps/sim/lib/collab-doc/seed.ts @@ -3,14 +3,14 @@ import { FILE_DOC_SEED, FILE_DOC_TIMEOUTS } from '@sim/realtime-protocol/file-do import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import * as Y from 'yjs' +import { applyMarkdownToYDoc, markdownToYDoc } from '@/lib/collab-doc/converter' import { assertCollabDocStateSize, CollabDocStateConflictError, commitCollabDocState, hashMarkdown, loadCollabDocState, -} from '@/lib/collab-doc/collab-state' -import { applyMarkdownToYDoc, markdownToYDoc } from '@/lib/collab-doc/converter' +} from '@/lib/collab-doc/state' import { fetchWorkspaceFileBuffer, getWorkspaceFile } from '@/lib/uploads/contexts/workspace' import { splitFrontmatter } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/markdown-fidelity' diff --git a/apps/sim/lib/collab-doc/collab-state.test.ts b/apps/sim/lib/collab-doc/state.test.ts similarity index 99% rename from apps/sim/lib/collab-doc/collab-state.test.ts rename to apps/sim/lib/collab-doc/state.test.ts index 92b62186dbb..6c55e94db29 100644 --- a/apps/sim/lib/collab-doc/collab-state.test.ts +++ b/apps/sim/lib/collab-doc/state.test.ts @@ -11,7 +11,7 @@ import { MAX_COLLAB_DOC_STATE_BYTES, type PreparedCollabDocState, saveCollabDocStateInTx, -} from '@/lib/collab-doc/collab-state' +} from '@/lib/collab-doc/state' const VERSION = new Date('2026-09-07T10:00:00.123Z') diff --git a/apps/sim/lib/collab-doc/collab-state.ts b/apps/sim/lib/collab-doc/state.ts similarity index 100% rename from apps/sim/lib/collab-doc/collab-state.ts rename to apps/sim/lib/collab-doc/state.ts diff --git a/apps/sim/lib/compare/data/sim.ts b/apps/sim/lib/compare/data/sim.ts index ebd0227eb45..e4fe00624d6 100644 --- a/apps/sim/lib/compare/data/sim.ts +++ b/apps/sim/lib/compare/data/sim.ts @@ -246,7 +246,7 @@ export const simProfile: CompetitorProfile = { confidence: 'verified', sources: [ { - url: 'https://github.com/simstudioai/sim/blob/main/apps/sim/lib/workflows/diff/diff-engine.ts', + url: 'https://github.com/simstudioai/sim/blob/main/apps/sim/lib/workflows/diff/engine.ts', label: 'Sim codebase: WorkflowDiffEngine', asOf: '2026-07-02', }, @@ -519,7 +519,7 @@ export const simProfile: CompetitorProfile = { confidence: 'verified', sources: [ { - url: 'https://github.com/simstudioai/sim/blob/main/apps/sim/executor/handlers/agent/agent-handler.ts', + url: 'https://github.com/simstudioai/sim/blob/main/apps/sim/executor/handlers/agent/handler.ts', label: 'Sim codebase: agent tool resolution (pre-wired only)', asOf: '2026-07-02', }, diff --git a/apps/sim/lib/core/execution-limits/types.ts b/apps/sim/lib/core/execution-limits/types.ts index 02984464a4b..ade84a929e6 100644 --- a/apps/sim/lib/core/execution-limits/types.ts +++ b/apps/sim/lib/core/execution-limits/types.ts @@ -1,4 +1,4 @@ -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { MAX_WORKFLOW_EXECUTION_TIMEOUT_SECONDS, parseWorkflowExecutionTimeoutSeconds, diff --git a/apps/sim/lib/core/network/resource-scope.server.test.ts b/apps/sim/lib/core/network/resource-scope.server.test.ts index 252ad7b61d6..be1a02276bb 100644 --- a/apps/sim/lib/core/network/resource-scope.server.test.ts +++ b/apps/sim/lib/core/network/resource-scope.server.test.ts @@ -6,7 +6,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/network/config.server', () => networkConfigMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { resolveCurrentOutboundRoute, diff --git a/apps/sim/lib/core/network/resource-scope.server.ts b/apps/sim/lib/core/network/resource-scope.server.ts index 6694a353a2d..85e3b5834b3 100644 --- a/apps/sim/lib/core/network/resource-scope.server.ts +++ b/apps/sim/lib/core/network/resource-scope.server.ts @@ -2,7 +2,7 @@ import { isOutboundRoutingEnabled } from '@/lib/core/network/config.server' import { runWithOutboundOrganization } from '@/lib/core/network/context.server' import { OutboundRoutingError } from '@/lib/core/network/routing' import { type ResourceOwner, resourceScopeFromOwner } from '@/lib/core/resource-scope' -import { loadWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** Establishes routing after resource authorization, reloading current workspace ownership when needed. */ export async function withResourceOutboundScope( diff --git a/apps/sim/lib/core/outbox/handlers.ts b/apps/sim/lib/core/outbox/handlers.ts index ebff468165c..9affb53e250 100644 --- a/apps/sim/lib/core/outbox/handlers.ts +++ b/apps/sim/lib/core/outbox/handlers.ts @@ -200,7 +200,7 @@ export const OUTBOX_HANDLER_GROUPS: readonly LazyOutboxHandlerGroup[] = [ events: [WORKSPACE_FILE_LIVE_DOC_OUTBOX_EVENT], load: async () => { const { workspaceFileLiveDocOutboxHandlers } = await import( - '@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox' + '@/lib/uploads/contexts/workspace/file-live-doc-outbox' ) return workspaceFileLiveDocOutboxHandlers }, @@ -209,7 +209,7 @@ export const OUTBOX_HANDLER_GROUPS: readonly LazyOutboxHandlerGroup[] = [ events: [WORKSPACE_FILE_STORAGE_CLEANUP_OUTBOX_EVENT], load: async () => { const { workspaceFileStorageCleanupOutboxHandlers } = await import( - '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' + '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' ) return workspaceFileStorageCleanupOutboxHandlers }, diff --git a/apps/sim/lib/core/outbox/processor.test.ts b/apps/sim/lib/core/outbox/processor.test.ts index 4676a76503e..98913f0a8e0 100644 --- a/apps/sim/lib/core/outbox/processor.test.ts +++ b/apps/sim/lib/core/outbox/processor.test.ts @@ -14,7 +14,7 @@ vi.mock('@/lib/knowledge/documents/processing-recovery', () => ({ vi.mock('@/ee/workspace-forking/lib/background-work/store', () => ({ reapStaleBackgroundWork: mocks.reap, })) -vi.mock('@/lib/knowledge/connectors/connector-error', () => ({ +vi.mock('@/lib/knowledge/connectors/error', () => ({ getConnectorFailureDiagnostic: () => undefined, })) vi.mock('@/lib/core/outbox/handlers', () => ({ OUTBOX_HANDLER_GROUPS: [] })) diff --git a/apps/sim/lib/core/outbox/processor.ts b/apps/sim/lib/core/outbox/processor.ts index 995e70b57d2..240e78a7502 100644 --- a/apps/sim/lib/core/outbox/processor.ts +++ b/apps/sim/lib/core/outbox/processor.ts @@ -9,7 +9,7 @@ import { OUTBOX_HANDLER_GROUPS } from '@/lib/core/outbox/handlers' import { pruneCompletedOutboxEvents } from '@/lib/core/outbox/retention' import { type ProcessOutboxResult, processOutboxEvents } from '@/lib/core/outbox/service' import { DeadlineExceededError } from '@/lib/core/utils/deadline' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { recoverKnowledgeDocumentProcessing } from '@/lib/knowledge/documents/processing-recovery' import { reapStaleBackgroundWork } from '@/ee/workspace-forking/lib/background-work/store' diff --git a/apps/sim/lib/core/rate-limiter/hosted-key/index.ts b/apps/sim/lib/core/rate-limiter/hosted-key/index.ts index fabbe8958ba..d5d003dd873 100644 --- a/apps/sim/lib/core/rate-limiter/hosted-key/index.ts +++ b/apps/sim/lib/core/rate-limiter/hosted-key/index.ts @@ -2,7 +2,7 @@ export { getHostedKeyRateLimiter, HostedKeyRateLimiter, resetHostedKeyRateLimiter, -} from './hosted-key-rate-limiter' +} from './rate-limiter' export { DEFAULT_BURST_MULTIPLIER, DEFAULT_WINDOW_MS, diff --git a/apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts b/apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.test.ts similarity index 99% rename from apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts rename to apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.test.ts index a06fac8caf0..6f718a1ae28 100644 --- a/apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts +++ b/apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.test.ts @@ -4,8 +4,8 @@ import type { RateLimitStorageAdapter, TokenStatus, } from '@/lib/core/rate-limiter/storage' -import { HostedKeyRateLimiter } from './hosted-key-rate-limiter' import { HEARTBEAT_REFRESH_INTERVAL_MS, type HostedKeyQueue } from './queue' +import { HostedKeyRateLimiter } from './rate-limiter' import type { CustomRateLimit, PerRequestRateLimit } from './types' /** Force the queue wait to give up on the first iteration by reporting a retry time diff --git a/apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.ts b/apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.ts similarity index 100% rename from apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.ts rename to apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.ts diff --git a/apps/sim/lib/credential-groups/application/context.ts b/apps/sim/lib/credential-groups/application/context.ts index ef23a367375..a9ab2ce4dd1 100644 --- a/apps/sim/lib/credential-groups/application/context.ts +++ b/apps/sim/lib/credential-groups/application/context.ts @@ -3,7 +3,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import type { CredentialGroupApplicationContext } from '@/lib/credential-groups/application/authorization' import { isCredentialGroupsAvailable } from '@/lib/credential-groups/availability' import { loadCredentialGroupCredentialListContext } from '@/lib/credential-groups/credentials' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export async function requireCredentialGroupSettingsAvailable(workspaceId: string): Promise { const ownerBilling = await getWorkspaceOwnerSubscriptionAccess(workspaceId) diff --git a/apps/sim/lib/credential-groups/application/list-credentials.test.ts b/apps/sim/lib/credential-groups/application/list-credentials.test.ts index d15061239eb..00a071f6fc3 100644 --- a/apps/sim/lib/credential-groups/application/list-credentials.test.ts +++ b/apps/sim/lib/credential-groups/application/list-credentials.test.ts @@ -32,7 +32,7 @@ vi.mock('@/lib/credential-groups/scoped-availability', () => credentialGroupsAva vi.mock('@/lib/resource-policies/repository', () => resourcePolicyRepositoryMock) vi.mock('@/lib/credential-groups/credentials', () => credentialGroupsCredentialsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credential-groups/application/list-mcp-connections.test.ts b/apps/sim/lib/credential-groups/application/list-mcp-connections.test.ts index cbb96714bb0..aa2c1cb9fa7 100644 --- a/apps/sim/lib/credential-groups/application/list-mcp-connections.test.ts +++ b/apps/sim/lib/credential-groups/application/list-mcp-connections.test.ts @@ -47,7 +47,7 @@ vi.mock('@/lib/credential-groups/mcp-connections', () => ({ MAX_CREDENTIAL_GROUP_MCP_CONNECTION_PAGE_SIZE: 100, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credential-groups/application/slack-managed-users.test.ts b/apps/sim/lib/credential-groups/application/slack-managed-users.test.ts index 43dac8610f4..ab422cead40 100644 --- a/apps/sim/lib/credential-groups/application/slack-managed-users.test.ts +++ b/apps/sim/lib/credential-groups/application/slack-managed-users.test.ts @@ -31,7 +31,7 @@ vi.mock('@/lib/credential-groups/organization-setup', () => credentialGroupsOrga vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/core/application/organization-authorization', () => organizationAuthorizationMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/credential-groups/scoped-availability', () => credentialGroupsAvailabilityMock) vi.mock('@/lib/credential-groups/slack-managed-users', () => ({ createSlackManagedUsersAttempt: hoisted.create, diff --git a/apps/sim/lib/credential-groups/application/slack-managed-users.ts b/apps/sim/lib/credential-groups/application/slack-managed-users.ts index 565e0f4ac9c..698b7e8d640 100644 --- a/apps/sim/lib/credential-groups/application/slack-managed-users.ts +++ b/apps/sim/lib/credential-groups/application/slack-managed-users.ts @@ -24,7 +24,7 @@ import { exchangeAndConfigureSlackManagedUsers, loadSlackManagedUsersAttempt, } from '@/lib/credential-groups/slack-managed-users' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' async function authorizeSlackConfiguration( principal: Principal, diff --git a/apps/sim/lib/credentials/api/route-policies.test.ts b/apps/sim/lib/credentials/api/route-policies.test.ts index ddf56400226..c03e9aa6371 100644 --- a/apps/sim/lib/credentials/api/route-policies.test.ts +++ b/apps/sim/lib/credentials/api/route-policies.test.ts @@ -7,7 +7,7 @@ import { internalCredentialErrorPolicy, internalPersonalCredentialConnectionErrorPolicy, } from '@/lib/credentials/api/route-policies' -import { CredentialProviderOperationError } from '@/lib/credentials/application/credential-crud' +import { CredentialProviderOperationError } from '@/lib/credentials/application/crud' import { OAuthDisconnectLimitError, OAuthDisconnectPartialFailureError, diff --git a/apps/sim/lib/credentials/api/route-policies.ts b/apps/sim/lib/credentials/api/route-policies.ts index 89b54e4665a..bda9ab260a8 100644 --- a/apps/sim/lib/credentials/api/route-policies.ts +++ b/apps/sim/lib/credentials/api/route-policies.ts @@ -14,7 +14,7 @@ import { CredentialGroupProviderConfigurationError, } from '@/lib/credential-groups/provider-adapter' import { CredentialAccessRequiredError } from '@/lib/credentials/application/authorized-credential-use-case' -import { CredentialProviderOperationError } from '@/lib/credentials/application/credential-crud' +import { CredentialProviderOperationError } from '@/lib/credentials/application/crud' import { OAuthDisconnectConfigurationError, OAuthDisconnectLimitError, diff --git a/apps/sim/lib/credentials/application/complete-quickbooks-connection.test.ts b/apps/sim/lib/credentials/application/complete-quickbooks-connection.test.ts index c5dcae8e57c..561edcf860f 100644 --- a/apps/sim/lib/credentials/application/complete-quickbooks-connection.test.ts +++ b/apps/sim/lib/credentials/application/complete-quickbooks-connection.test.ts @@ -21,7 +21,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@sim/utils/id', () => idMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/credentials/application/connection-target', () => ({ resolveCredentialConnectionTarget: hoisted.resolveTarget, })) diff --git a/apps/sim/lib/credentials/application/complete-quickbooks-connection.ts b/apps/sim/lib/credentials/application/complete-quickbooks-connection.ts index a41137e4a32..ca9bd46a41a 100644 --- a/apps/sim/lib/credentials/application/complete-quickbooks-connection.ts +++ b/apps/sim/lib/credentials/application/complete-quickbooks-connection.ts @@ -17,7 +17,7 @@ import { getCanonicalScopesForProvider } from '@/lib/oauth/utils' import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export interface CompleteQuickBooksConnectionInput { draftId: string diff --git a/apps/sim/lib/credentials/application/connection-target.ts b/apps/sim/lib/credentials/application/connection-target.ts index c30d685d38a..324583008a8 100644 --- a/apps/sim/lib/credentials/application/connection-target.ts +++ b/apps/sim/lib/credentials/application/connection-target.ts @@ -12,7 +12,7 @@ import { import { getWorkspaceCredential } from '@/lib/credentials/queries' import { credentialProviderMatchesService } from '@/lib/oauth/utils' import { assertWorkspaceCapability } from '@/lib/permission-groups/capability-assertions' -import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface ResolvedCredentialConnectionTarget { provider: OAuthCredentialProviderCatalogEntry diff --git a/apps/sim/lib/credentials/application/credential-context.ts b/apps/sim/lib/credentials/application/context.ts similarity index 98% rename from apps/sim/lib/credentials/application/credential-context.ts rename to apps/sim/lib/credentials/application/context.ts index bb5107fa233..ce4a9c6e2c9 100644 --- a/apps/sim/lib/credentials/application/credential-context.ts +++ b/apps/sim/lib/credentials/application/context.ts @@ -1,7 +1,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import type { CredentialAuthorizationContext } from '@/lib/credentials/application/authorized-credential-use-case' import { getCredentialById, getWorkspaceCredential } from '@/lib/credentials/queries' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface ResolveCredentialApplicationContextInput { credentialId: string diff --git a/apps/sim/lib/credentials/application/create-credential-connection.test.ts b/apps/sim/lib/credentials/application/create-credential-connection.test.ts index 9a9b4ce821a..f63ab4b58ad 100644 --- a/apps/sim/lib/credentials/application/create-credential-connection.test.ts +++ b/apps/sim/lib/credentials/application/create-credential-connection.test.ts @@ -12,7 +12,7 @@ const hoisted = vi.hoisted(() => ({ createDraft: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credentials/application/create-credential-connection.ts b/apps/sim/lib/credentials/application/create-credential-connection.ts index e11aae62ebb..156b3541b47 100644 --- a/apps/sim/lib/credentials/application/create-credential-connection.ts +++ b/apps/sim/lib/credentials/application/create-credential-connection.ts @@ -7,7 +7,7 @@ import { resolveCredentialConnectionTarget } from '@/lib/credentials/application import { credentialOperations } from '@/lib/credentials/application/operations' import { createConnectDraft } from '@/lib/credentials/connect-draft' import type { QuickBooksOAuthClientConfig } from '@/lib/oauth/quickbooks-client-config' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export type CreateCredentialConnectionInput = { workspaceId: string diff --git a/apps/sim/lib/credentials/application/credential-crud.test.ts b/apps/sim/lib/credentials/application/crud.test.ts similarity index 98% rename from apps/sim/lib/credentials/application/credential-crud.test.ts rename to apps/sim/lib/credentials/application/crud.test.ts index d0fdf548be0..1300e6f44e3 100644 --- a/apps/sim/lib/credentials/application/credential-crud.test.ts +++ b/apps/sim/lib/credentials/application/crud.test.ts @@ -37,7 +37,7 @@ const hoisted = vi.hoisted(() => ({ const resolveGroupConfigMock = permissionGroupScopeMockFns.mockResolvePermissionGroupConfig vi.mock('@sim/audit', () => auditMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/credentials/queries', () => ({ getWorkspaceCredential: hoisted.getWorkspaceCredential, @@ -70,7 +70,7 @@ import { PermissionGroupCapabilityError } from '@/lib/core/application' import { createWorkspaceCredential, updateWorkspaceCredentialUseCase, -} from '@/lib/credentials/application/credential-crud' +} from '@/lib/credentials/application/crud' import { credentialOperations } from '@/lib/credentials/application/operations' import { DEFAULT_PERMISSION_GROUP_CONFIG } from '@/lib/permission-groups/fields' diff --git a/apps/sim/lib/credentials/application/credential-crud.ts b/apps/sim/lib/credentials/application/crud.ts similarity index 99% rename from apps/sim/lib/credentials/application/credential-crud.ts rename to apps/sim/lib/credentials/application/crud.ts index dcc6aa02074..949aa81b2a5 100644 --- a/apps/sim/lib/credentials/application/credential-crud.ts +++ b/apps/sim/lib/credentials/application/crud.ts @@ -13,7 +13,7 @@ import { requireCredentialAccess, requireManageableCredentialType, } from '@/lib/credentials/application/authorized-credential-use-case' -import { resolveCredentialApplicationContext } from '@/lib/credentials/application/credential-context' +import { resolveCredentialApplicationContext } from '@/lib/credentials/application/context' import { credentialOperations } from '@/lib/credentials/application/operations' import { requireWorkspacePersonalAccounts } from '@/lib/credentials/application/workspace-personal-accounts' import { syncWorkspaceOAuthCredentialsForUser } from '@/lib/credentials/oauth' @@ -41,7 +41,7 @@ import { createIntegrationCredentialVisibility } from '@/lib/integrations/creden import { allowedIntegrationTypes } from '@/lib/integrations/principal-scope.server' import { assertWorkspaceCapability } from '@/lib/permission-groups/capability-assertions' import { captureServerEvent } from '@/lib/posthog/server' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils' export class CredentialProviderOperationError extends OrchestrationError { diff --git a/apps/sim/lib/credentials/application/discover-managed-mcp-tools.test.ts b/apps/sim/lib/credentials/application/discover-managed-mcp-tools.test.ts index 85d9f375e0f..a1dc62992be 100644 --- a/apps/sim/lib/credentials/application/discover-managed-mcp-tools.test.ts +++ b/apps/sim/lib/credentials/application/discover-managed-mcp-tools.test.ts @@ -39,7 +39,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@/lib/mothership/chat/payload', () => mothershipChatPayloadMock) vi.mock('@/ee/access-control/utils/permission-check', () => permissionCheckMock) vi.mock('@/lib/mcp/application/use-cases', () => mcpUseCasesMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@sim/workflow-persistence/load', () => ({ diff --git a/apps/sim/lib/credentials/application/launch-credential-connection.test.ts b/apps/sim/lib/credentials/application/launch-credential-connection.test.ts index f89e5fd6514..2fd5226d316 100644 --- a/apps/sim/lib/credentials/application/launch-credential-connection.test.ts +++ b/apps/sim/lib/credentials/application/launch-credential-connection.test.ts @@ -15,7 +15,7 @@ vi.mock('@/lib/credentials/connect-draft', () => ({ getActiveConnectDraft: hoisted.getActiveDraft, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credentials/application/launch-credential-connection.ts b/apps/sim/lib/credentials/application/launch-credential-connection.ts index 08e39d3e8a8..bace09da2ae 100644 --- a/apps/sim/lib/credentials/application/launch-credential-connection.ts +++ b/apps/sim/lib/credentials/application/launch-credential-connection.ts @@ -6,7 +6,7 @@ import { type ConnectDraft, getActiveConnectDraft } from '@/lib/credentials/conn import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export interface LaunchCredentialConnectionInput { draftId: string diff --git a/apps/sim/lib/credentials/application/list-credential-providers.test.ts b/apps/sim/lib/credentials/application/list-credential-providers.test.ts index 7dca3be2cd2..ba9c1b7472f 100644 --- a/apps/sim/lib/credentials/application/list-credential-providers.test.ts +++ b/apps/sim/lib/credentials/application/list-credential-providers.test.ts @@ -10,7 +10,7 @@ const hoisted = vi.hoisted(() => ({ listCatalog: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credentials/application/list-credential-providers.ts b/apps/sim/lib/credentials/application/list-credential-providers.ts index c7ca08e6db3..b419bc99e4d 100644 --- a/apps/sim/lib/credentials/application/list-credential-providers.ts +++ b/apps/sim/lib/credentials/application/list-credential-providers.ts @@ -7,7 +7,7 @@ import { listCredentialProviderCatalog, } from '@/lib/credentials/application/provider-catalog' import { GITHUB_INSTALLATION_PROVIDER_ID } from '@/lib/oauth/github-installation-types' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface ListCredentialProvidersInput { workspaceId: string diff --git a/apps/sim/lib/credentials/application/list-workspace-credentials.test.ts b/apps/sim/lib/credentials/application/list-workspace-credentials.test.ts index bb8bd996360..58d68c14a6c 100644 --- a/apps/sim/lib/credentials/application/list-workspace-credentials.test.ts +++ b/apps/sim/lib/credentials/application/list-workspace-credentials.test.ts @@ -16,7 +16,7 @@ const hoisted = vi.hoisted(() => ({ listForWorkspacePrincipal: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credentials/application/list-workspace-credentials.ts b/apps/sim/lib/credentials/application/list-workspace-credentials.ts index fcf332f33d1..9e1e85d498c 100644 --- a/apps/sim/lib/credentials/application/list-workspace-credentials.ts +++ b/apps/sim/lib/credentials/application/list-workspace-credentials.ts @@ -10,7 +10,7 @@ import { listWorkspacePrincipalCredentials, type VisibleWorkspaceCredential, } from '@/lib/credentials/queries' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils' export interface ListWorkspaceCredentialsInput { diff --git a/apps/sim/lib/credentials/application/credential-members.ts b/apps/sim/lib/credentials/application/members.ts similarity index 99% rename from apps/sim/lib/credentials/application/credential-members.ts rename to apps/sim/lib/credentials/application/members.ts index 691a7276642..0e4e57a70dd 100644 --- a/apps/sim/lib/credentials/application/credential-members.ts +++ b/apps/sim/lib/credentials/application/members.ts @@ -9,7 +9,7 @@ import { requireManageableCredentialType, } from '@/lib/credentials/application/authorized-credential-use-case' import { defineAuthorizedCredentialUserUseCase } from '@/lib/credentials/application/authorized-user-use-case' -import { resolveCredentialApplicationContext } from '@/lib/credentials/application/credential-context' +import { resolveCredentialApplicationContext } from '@/lib/credentials/application/context' import { credentialOperations, credentialUserOperations, diff --git a/apps/sim/lib/credentials/application/organization-credentials.test.ts b/apps/sim/lib/credentials/application/organization-credentials.test.ts index 2a65197d8a9..7655357c138 100644 --- a/apps/sim/lib/credentials/application/organization-credentials.test.ts +++ b/apps/sim/lib/credentials/application/organization-credentials.test.ts @@ -38,7 +38,7 @@ vi.mock('@/lib/credentials/application/provider-catalog', () => ({ requireAvailableOAuthCredentialProvider: hoisted.requireOAuth, requireAvailableServiceAccountCredentialProvider: hoisted.requireService, })) -vi.mock('@/lib/credentials/application/credential-crud', () => ({ +vi.mock('@/lib/credentials/application/crud', () => ({ throwCredentialMutationFailure: (result: { error?: string }) => { throw new Error(result.error) }, diff --git a/apps/sim/lib/credentials/application/organization-credentials.ts b/apps/sim/lib/credentials/application/organization-credentials.ts index 97ea3207545..aadb9280dfe 100644 --- a/apps/sim/lib/credentials/application/organization-credentials.ts +++ b/apps/sim/lib/credentials/application/organization-credentials.ts @@ -20,7 +20,7 @@ import { PrincipalKindAuthorizationError } from '@/lib/core/application/workspac import { withResourceOutboundScope } from '@/lib/core/network/resource-scope.server' import { OrchestrationError } from '@/lib/core/orchestration/types' import { resourceScopeCondition } from '@/lib/core/resource-scope.server' -import { throwCredentialMutationFailure } from '@/lib/credentials/application/credential-crud' +import { throwCredentialMutationFailure } from '@/lib/credentials/application/crud' import { listCredentialProviderCatalog, requireAvailableOAuthCredentialProvider, diff --git a/apps/sim/lib/credentials/application/personal-connection.test.ts b/apps/sim/lib/credentials/application/personal-connection.test.ts index 36d5dcb6295..01c639d6552 100644 --- a/apps/sim/lib/credentials/application/personal-connection.test.ts +++ b/apps/sim/lib/credentials/application/personal-connection.test.ts @@ -40,7 +40,7 @@ const hoisted = vi.hoisted(() => ({ personal: vi.fn(), startOAuth: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/credentials/application/provider-catalog', () => ({ listCredentialProviderCatalog: hoisted.catalog, diff --git a/apps/sim/lib/credentials/application/personal-connection.ts b/apps/sim/lib/credentials/application/personal-connection.ts index cdb123d7102..c824ad03f57 100644 --- a/apps/sim/lib/credentials/application/personal-connection.ts +++ b/apps/sim/lib/credentials/application/personal-connection.ts @@ -9,7 +9,7 @@ import { credentialOperations } from '@/lib/credentials/application/operations' import { listCredentialProviderCatalog } from '@/lib/credentials/application/provider-catalog' import { requireWorkspacePersonalAccounts } from '@/lib/credentials/application/workspace-personal-accounts' import { getPersonalOAuthCredentials } from '@/lib/credentials/personal' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface StartPersonalCredentialConnectionInput { workspaceId: string diff --git a/apps/sim/lib/credentials/application/personal-credentials.test.ts b/apps/sim/lib/credentials/application/personal-credentials.test.ts index 12cada0d8da..625a4b33b39 100644 --- a/apps/sim/lib/credentials/application/personal-credentials.test.ts +++ b/apps/sim/lib/credentials/application/personal-credentials.test.ts @@ -16,7 +16,7 @@ const hoisted = vi.hoisted(() => ({ listTokens: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/credentials/application/personal-credentials.ts b/apps/sim/lib/credentials/application/personal-credentials.ts index 9271ff4c449..4d85e70f30a 100644 --- a/apps/sim/lib/credentials/application/personal-credentials.ts +++ b/apps/sim/lib/credentials/application/personal-credentials.ts @@ -13,7 +13,7 @@ import { type PersonalTokenCredential, } from '@/lib/credentials/personal-tokens' import { providerIdsForService } from '@/lib/oauth/utils' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' async function resolveContext({ input }: { input: { workspaceId: string } }) { const context = await loadActiveWorkspaceApplicationContext(input.workspaceId) diff --git a/apps/sim/lib/credentials/application/prepare-credential-connection.test.ts b/apps/sim/lib/credentials/application/prepare-credential-connection.test.ts index 17046dd1622..17a48ea8e33 100644 --- a/apps/sim/lib/credentials/application/prepare-credential-connection.test.ts +++ b/apps/sim/lib/credentials/application/prepare-credential-connection.test.ts @@ -19,7 +19,7 @@ const hoisted = vi.hoisted(() => ({ allowedIntegrations: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/credentials/application/provider-catalog', () => ({ listCredentialProviderCatalog: hoisted.listCatalog, diff --git a/apps/sim/lib/credentials/application/prepare-credential-connection.ts b/apps/sim/lib/credentials/application/prepare-credential-connection.ts index 195e5ff0be2..73e9a37b540 100644 --- a/apps/sim/lib/credentials/application/prepare-credential-connection.ts +++ b/apps/sim/lib/credentials/application/prepare-credential-connection.ts @@ -16,7 +16,7 @@ import { isServiceAccountProviderId } from '@/lib/credentials/service-account-pr import { createIntegrationCredentialVisibility } from '@/lib/integrations/credential-visibility.server' import { allowedIntegrationTypes } from '@/lib/integrations/principal-scope.server' import { credentialProviderMatchesService } from '@/lib/oauth/utils' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface PrepareCredentialConnectionInput { workspaceId: string diff --git a/apps/sim/lib/credentials/application/provider-catalog-contract.test.ts b/apps/sim/lib/credentials/application/provider-catalog-contract.test.ts index 4eaed355f21..85447ca97ec 100644 --- a/apps/sim/lib/credentials/application/provider-catalog-contract.test.ts +++ b/apps/sim/lib/credentials/application/provider-catalog-contract.test.ts @@ -12,7 +12,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@/lib/core/config/block-visibility', () => blockVisibilityMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/integrations/principal-scope.server', () => ({ principalUserId: () => 'user-1', diff --git a/apps/sim/lib/credentials/application/resolve-personal-token.test.ts b/apps/sim/lib/credentials/application/resolve-personal-token.test.ts index 5ce4f6c0fce..af69e250f21 100644 --- a/apps/sim/lib/credentials/application/resolve-personal-token.test.ts +++ b/apps/sim/lib/credentials/application/resolve-personal-token.test.ts @@ -20,7 +20,7 @@ const hoisted = vi.hoisted(() => ({ decrypt: vi.fn(), enrollment: vi.fn(), })) -vi.mock('@/lib/credentials/application/credential-context', () => ({ +vi.mock('@/lib/credentials/application/context', () => ({ resolveCredentialApplicationContext: hoisted.context, })) vi.mock('@/lib/credentials/access', () => credentialsAccessMock) diff --git a/apps/sim/lib/credentials/application/resolve-personal-token.ts b/apps/sim/lib/credentials/application/resolve-personal-token.ts index 3b0613df538..4a47a1ab7bb 100644 --- a/apps/sim/lib/credentials/application/resolve-personal-token.ts +++ b/apps/sim/lib/credentials/application/resolve-personal-token.ts @@ -4,7 +4,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { resourceScopeFields, resourceScopeFromOwner } from '@/lib/core/resource-scope' import { requireOrganizationAccountsWorkspaceAccess } from '@/lib/credential-groups/application/organization-workspace-access' import { defineAuthorizedCredentialUseCase } from '@/lib/credentials/application/authorized-credential-use-case' -import { resolveCredentialApplicationContext } from '@/lib/credentials/application/credential-context' +import { resolveCredentialApplicationContext } from '@/lib/credentials/application/context' import { credentialOperations } from '@/lib/credentials/application/operations' import { decryptPersonalToken } from '@/lib/credentials/gitlab-personal-token' import { requirePersonalTokenEnrollment } from '@/lib/credentials/personal-tokens' diff --git a/apps/sim/lib/credentials/application/save-credential-draft.test.ts b/apps/sim/lib/credentials/application/save-credential-draft.test.ts index bf0b126fa4f..5e221b92a93 100644 --- a/apps/sim/lib/credentials/application/save-credential-draft.test.ts +++ b/apps/sim/lib/credentials/application/save-credential-draft.test.ts @@ -14,7 +14,7 @@ const hoisted = vi.hoisted(() => ({ createDraft: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/credentials/access', () => credentialsAccessMock) vi.mock('@/lib/credentials/connect-draft', () => ({ diff --git a/apps/sim/lib/credentials/application/save-credential-draft.ts b/apps/sim/lib/credentials/application/save-credential-draft.ts index bc3051dcf2e..0329a3a5fcf 100644 --- a/apps/sim/lib/credentials/application/save-credential-draft.ts +++ b/apps/sim/lib/credentials/application/save-credential-draft.ts @@ -5,7 +5,7 @@ import { type CredentialActorContext, getCredentialActorContext } from '@/lib/cr import { credentialOperations } from '@/lib/credentials/application/operations' import { createConnectDraft } from '@/lib/credentials/connect-draft' import type { QuickBooksOAuthClientConfig } from '@/lib/oauth/quickbooks-client-config' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface SaveCredentialDraftInput { workspaceId: string diff --git a/apps/sim/lib/credentials/application/service-account.test.ts b/apps/sim/lib/credentials/application/service-account.test.ts index a8fc4684c70..0db61e5fff0 100644 --- a/apps/sim/lib/credentials/application/service-account.test.ts +++ b/apps/sim/lib/credentials/application/service-account.test.ts @@ -26,7 +26,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@sim/audit', () => auditMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/credentials/orchestration', () => ({ createServiceAccountCredential: hoisted.create, diff --git a/apps/sim/lib/credentials/application/service-account.ts b/apps/sim/lib/credentials/application/service-account.ts index 9a5c71f9256..25f099c0302 100644 --- a/apps/sim/lib/credentials/application/service-account.ts +++ b/apps/sim/lib/credentials/application/service-account.ts @@ -10,7 +10,7 @@ import { defineAuthorizedCredentialUseCase, requireManageableCredentialType, } from '@/lib/credentials/application/authorized-credential-use-case' -import { resolveCredentialApplicationContext } from '@/lib/credentials/application/credential-context' +import { resolveCredentialApplicationContext } from '@/lib/credentials/application/context' import { credentialOperations } from '@/lib/credentials/application/operations' import { listCredentialProviderCatalog, @@ -25,7 +25,7 @@ import type { CredentialRow } from '@/lib/credentials/queries' import { getEffectiveDecryptedEnv } from '@/lib/environment/utils' import { SLACK_CUSTOM_BOT_PROVIDER_ID } from '@/lib/oauth/types' import { captureServerEvent } from '@/lib/posthog/server' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' type InlineServiceAccountInput = Omit diff --git a/apps/sim/lib/credentials/application/credential-sharing.integration.ts b/apps/sim/lib/credentials/application/sharing.integration.ts similarity index 99% rename from apps/sim/lib/credentials/application/credential-sharing.integration.ts rename to apps/sim/lib/credentials/application/sharing.integration.ts index 5134670bcfd..7bbba0f27d4 100644 --- a/apps/sim/lib/credentials/application/credential-sharing.integration.ts +++ b/apps/sim/lib/credentials/application/sharing.integration.ts @@ -19,7 +19,7 @@ describe('Credential sharing through user-held API credentials in PostgreSQL', ( import('@sim/db'), import('@sim/db/schema'), import('drizzle-orm'), - import('@/lib/credentials/application/credential-members'), + import('@/lib/credentials/application/members'), ]) return { db, schema, and, eq, inArray, ...useCases } } diff --git a/apps/sim/lib/credentials/environment.test.ts b/apps/sim/lib/credentials/environment.test.ts index a7097061d13..bfec5803029 100644 --- a/apps/sim/lib/credentials/environment.test.ts +++ b/apps/sim/lib/credentials/environment.test.ts @@ -18,7 +18,7 @@ const { mockLockPersonalEnvMap } = vi.hoisted(() => ({ mockLockPersonalEnvMap: vi.fn(), })) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/credentials/env-locks', () => ({ lockPersonalEnvMap: mockLockPersonalEnvMap, diff --git a/apps/sim/lib/credentials/environment.ts b/apps/sim/lib/credentials/environment.ts index 03c44c20729..a206816fcc5 100644 --- a/apps/sim/lib/credentials/environment.ts +++ b/apps/sim/lib/credentials/environment.ts @@ -14,7 +14,7 @@ import { permissionSatisfies } from '@sim/platform-authz/workspace' import { chunkArray } from '@sim/utils/helpers' import { generateId } from '@sim/utils/id' import { and, asc, eq, inArray, isNotNull, isNull, notInArray, or, sql } from 'drizzle-orm' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { isManagedCredentialGroupBindingLive } from '@/lib/credential-groups/credentials' import { lockPersonalEnvMap } from '@/lib/credentials/env-locks' import type { DbOrTx, DbTransaction } from '@/lib/db/types' diff --git a/apps/sim/lib/credentials/managed-mcp.test.ts b/apps/sim/lib/credentials/managed-mcp.test.ts index 13756237c0f..4b7290d8a85 100644 --- a/apps/sim/lib/credentials/managed-mcp.test.ts +++ b/apps/sim/lib/credentials/managed-mcp.test.ts @@ -13,7 +13,7 @@ vi.mock('@/lib/credential-groups/enrollments', () => credentialGroupsEnrollments vi.mock('@/lib/core/security/encryption', () => encryptionMock) vi.mock('@/lib/billing/core/workspace-access', () => billingWorkspaceAccessMock) vi.mock('@/lib/credential-groups/availability', () => ({ isCredentialGroupsAvailable: vi.fn() })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { persistManagedMcpCredential, diff --git a/apps/sim/lib/credentials/managed-mcp.ts b/apps/sim/lib/credentials/managed-mcp.ts index 54ca13c9c88..b6d064f116c 100644 --- a/apps/sim/lib/credentials/managed-mcp.ts +++ b/apps/sim/lib/credentials/managed-mcp.ts @@ -30,7 +30,7 @@ import { isScopedCredentialGroupsAvailable } from '@/lib/credential-groups/scope import { loadPreregisteredClient } from '@/lib/mcp/oauth/provider' import { generateManagedMcpConnectionId } from '@/lib/mcp/utils' import { isSearchProviderEnabled } from '@/lib/sim-search/live/provider-rollout' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const MANAGED_MCP_TOKEN_SET_TYPE = 'managed-mcp-oauth-token-set' as const const MANAGED_MCP_TOKEN_SET_VERSION = 1 as const diff --git a/apps/sim/lib/credentials/managed-oauth.ts b/apps/sim/lib/credentials/managed-oauth.ts index 51a12431fcb..85c04690127 100644 --- a/apps/sim/lib/credentials/managed-oauth.ts +++ b/apps/sim/lib/credentials/managed-oauth.ts @@ -23,7 +23,7 @@ import { import { getCredentialGroupProviderAdapterByProviderId } from '@/lib/credential-groups/provider-registry' import { isScopedCredentialGroupsAvailable } from '@/lib/credential-groups/scoped-availability' import { acquireAdvisoryXactLock } from '@/lib/db/advisory-locks' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('ManagedOAuthCredential') diff --git a/apps/sim/lib/dashboards/application/availability.ts b/apps/sim/lib/dashboards/application/availability.ts index d5ecc8008a3..7c3b91dcd94 100644 --- a/apps/sim/lib/dashboards/application/availability.ts +++ b/apps/sim/lib/dashboards/application/availability.ts @@ -1,6 +1,6 @@ import { defineAuthorizedWorkspaceUseCase, defineWorkspaceOperation } from '@/lib/core/application' import { isDashboardsEnabled } from '@/lib/dashboards/feature-flag' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** permission-group-exempt: reports rollout availability only; resource operations enforce files.use. */ const availabilityOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/dashboards/application/dashboards.test.ts b/apps/sim/lib/dashboards/application/dashboards.test.ts index 2bffe4950db..16d22a6e450 100644 --- a/apps/sim/lib/dashboards/application/dashboards.test.ts +++ b/apps/sim/lib/dashboards/application/dashboards.test.ts @@ -19,7 +19,7 @@ vi.mock('@/lib/dashboards/repository', () => ({ updateDashboardContent: hoisted.update, })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) import { diff --git a/apps/sim/lib/dashboards/application/dashboards.ts b/apps/sim/lib/dashboards/application/dashboards.ts index f6c57fb6cc2..90c586244ec 100644 --- a/apps/sim/lib/dashboards/application/dashboards.ts +++ b/apps/sim/lib/dashboards/application/dashboards.ts @@ -12,7 +12,7 @@ import { } from '@/lib/dashboards/repository' import { parseDashboardSpec } from '@/lib/dashboards/spec' import { notifyWorkspaceFilesChanged } from '@/lib/realtime/notify' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const authorizationOptions = { delegation: { audience: 'sim:workspaces', isWithinScope: () => true }, diff --git a/apps/sim/lib/desktop/application/import.integration.ts b/apps/sim/lib/desktop/application/import.integration.ts index 54eabf82b48..d913130056f 100644 --- a/apps/sim/lib/desktop/application/import.integration.ts +++ b/apps/sim/lib/desktop/application/import.integration.ts @@ -40,7 +40,7 @@ import { DesktopDeviceUnrecognizedError } from '@/lib/desktop/executor/errors' import { createWorkspaceFileFolder, listWorkspaceFileFolders, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' describe('desktop imports', () => { const userIds: string[] = [] diff --git a/apps/sim/lib/desktop/application/import.ts b/apps/sim/lib/desktop/application/import.ts index 7c1cdab9cb2..adf2329fa34 100644 --- a/apps/sim/lib/desktop/application/import.ts +++ b/apps/sim/lib/desktop/application/import.ts @@ -11,7 +11,7 @@ import { ensureWorkspaceFileChildFolder, loadActiveWorkspaceContext, } from '@/lib/uploads/contexts/workspace' -import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' import { createAuthorizedWorkspaceFile, diff --git a/apps/sim/lib/desktop/executor/desktop-call-classifier.integration.ts b/apps/sim/lib/desktop/executor/call-classifier.integration.ts similarity index 100% rename from apps/sim/lib/desktop/executor/desktop-call-classifier.integration.ts rename to apps/sim/lib/desktop/executor/call-classifier.integration.ts diff --git a/apps/sim/lib/embeddings/configuration-error.test.ts b/apps/sim/lib/embeddings/configuration-error.test.ts index 596f41358ab..e92943e0049 100644 --- a/apps/sim/lib/embeddings/configuration-error.test.ts +++ b/apps/sim/lib/embeddings/configuration-error.test.ts @@ -7,7 +7,7 @@ vi.mock('@/lib/api-key/byok', () => apiKeyByokMock) vi.mock('@/lib/core/config/api-keys', () => ({ getRotatingApiKey: mocks.rotation })) import { resolveProviderKey } from '@/lib/embeddings/keys' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' setEnv({ OPENAI_API_KEY: undefined }) diff --git a/apps/sim/lib/execution/cancellation.test.ts b/apps/sim/lib/execution/cancellation.test.ts index f84e8a11c65..c07c1beb3ae 100644 --- a/apps/sim/lib/execution/cancellation.test.ts +++ b/apps/sim/lib/execution/cancellation.test.ts @@ -21,7 +21,7 @@ const { const mockGetRedisClient = redisConfigMockFns.mockGetRedisClient -vi.mock('@/lib/execution/execution-signal', () => ({ +vi.mock('@/lib/execution/signal', () => ({ getExecutionSignalChannel: (executionId: string) => `execution:signal:${executionId}`, getExecutionSignalHub: () => ({ subscribe: mockSignalSubscribe }), LEGACY_EXECUTION_CANCEL_CHANNEL: 'execution:cancel', diff --git a/apps/sim/lib/execution/cancellation.ts b/apps/sim/lib/execution/cancellation.ts index 526ac9dfce1..bf41a79b2a6 100644 --- a/apps/sim/lib/execution/cancellation.ts +++ b/apps/sim/lib/execution/cancellation.ts @@ -5,7 +5,7 @@ import { getExecutionSignalHub, LEGACY_EXECUTION_CANCEL_CHANNEL, publishLocalExecutionSignal, -} from '@/lib/execution/execution-signal' +} from '@/lib/execution/signal' const logger = createLogger('ExecutionCancellation') diff --git a/apps/sim/lib/execution/constants.ts b/apps/sim/lib/execution/constants.ts index f53d7d28b4c..df9073f8456 100644 --- a/apps/sim/lib/execution/constants.ts +++ b/apps/sim/lib/execution/constants.ts @@ -1,5 +1,5 @@ import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits' -import type { SandboxTaskId } from '@/sandbox-tasks/registry' +import type { SandboxTaskId } from '@/sandboxes/registry' export { DEFAULT_EXECUTION_TIMEOUT_MS } diff --git a/apps/sim/lib/execution/execution-deadline-header.test.ts b/apps/sim/lib/execution/deadline-header.test.ts similarity index 92% rename from apps/sim/lib/execution/execution-deadline-header.test.ts rename to apps/sim/lib/execution/deadline-header.test.ts index 901da160baf..f4018cfeca3 100644 --- a/apps/sim/lib/execution/execution-deadline-header.test.ts +++ b/apps/sim/lib/execution/deadline-header.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest' import { INTERNAL_EXECUTION_DEADLINE_HEADER, parseExecutionDeadlineHeader, -} from '@/lib/execution/execution-deadline-header' +} from '@/lib/execution/deadline-header' describe('internal execution deadline header', () => { it('parses an absolute deadline', () => { diff --git a/apps/sim/lib/execution/execution-deadline-header.ts b/apps/sim/lib/execution/deadline-header.ts similarity index 100% rename from apps/sim/lib/execution/execution-deadline-header.ts rename to apps/sim/lib/execution/deadline-header.ts diff --git a/apps/sim/lib/execution/event-buffer.ts b/apps/sim/lib/execution/event-buffer.ts index abd1561f36e..79b15b45005 100644 --- a/apps/sim/lib/execution/event-buffer.ts +++ b/apps/sim/lib/execution/event-buffer.ts @@ -5,10 +5,6 @@ import { getConfiguredCacheProvider } from '@/lib/core/config/env-capabilities.s import { getRedisClient } from '@/lib/core/config/redis' import { getMaxExecutionTimeout } from '@/lib/core/execution-limits' import { getRedisBudgetKeys, getRedisBudgetLimits } from '@/lib/core/redis/byte-budget.server' -import { - getExecutionSignalChannel, - publishLocalExecutionSignal, -} from '@/lib/execution/execution-signal' import { LARGE_VALUE_THRESHOLD_BYTES } from '@/lib/execution/payloads/large-value-ref' import { compactExecutionPayload } from '@/lib/execution/payloads/serializer' import type { LargeValueStoreContext } from '@/lib/execution/payloads/store' @@ -16,6 +12,7 @@ import { ExecutionResourceLimitError, isExecutionResourceLimitError, } from '@/lib/execution/resource-errors' +import { getExecutionSignalChannel, publishLocalExecutionSignal } from '@/lib/execution/signal' import type { BlockStartedData, ExecutionEvent } from '@/lib/workflows/executor/execution-events' const logger = createLogger('ExecutionEventBuffer') diff --git a/apps/sim/lib/execution/files.test.ts b/apps/sim/lib/execution/files.test.ts index 5981f12837b..d743ef80799 100644 --- a/apps/sim/lib/execution/files.test.ts +++ b/apps/sim/lib/execution/files.test.ts @@ -25,7 +25,7 @@ const { mockUploadExecutionFile } = uploadsExecutionMockFns vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/core/network/resource-scope.server', () => ({ withResourceOutboundScope: (_: unknown, fn: () => unknown) => fn(), })) diff --git a/apps/sim/lib/execution/files.ts b/apps/sim/lib/execution/files.ts index ca70068556c..7164ee1fde7 100644 --- a/apps/sim/lib/execution/files.ts +++ b/apps/sim/lib/execution/files.ts @@ -13,7 +13,7 @@ import { inferContextFromKey, isInternalFileUrl, parseInternalFileUrl, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { workflowFileInputSchema } from '@/lib/workflows/input-file-schema' import { isFileFieldType } from '@/lib/workflows/input-format' import { TRIGGER_TYPES } from '@/lib/workflows/triggers/types' @@ -216,7 +216,7 @@ export async function processExecutionFile( storedFileScope ) } - const { downloadFileFromUrl } = await import('@/lib/uploads/utils/file-utils.server') + const { downloadFileFromUrl } = await import('@/lib/uploads/utils/file.server') const buffer = await withResourceOutboundScope(executionContext, () => downloadFileFromUrl(file.data, { userId }) ) diff --git a/apps/sim/lib/execution/mounted-file-secret-provenance.ts b/apps/sim/lib/execution/mounted-file-secret-provenance.ts index 19587809553..299e8323dc5 100644 --- a/apps/sim/lib/execution/mounted-file-secret-provenance.ts +++ b/apps/sim/lib/execution/mounted-file-secret-provenance.ts @@ -4,7 +4,7 @@ import { decryptSecret } from '@/lib/core/security/encryption' import { mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { createResolvedSecretMatcher, scanResolvedSecretString, diff --git a/apps/sim/lib/execution/payloads/file-secret-provenance.ts b/apps/sim/lib/execution/payloads/file-secret-provenance.ts index 1af18b999b3..eedd46e7e91 100644 --- a/apps/sim/lib/execution/payloads/file-secret-provenance.ts +++ b/apps/sim/lib/execution/payloads/file-secret-provenance.ts @@ -5,9 +5,9 @@ import { ExecutionFileAccessError, type ExecutionMaterializationContext, } from '@/lib/execution/payloads/materialization.server' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { getFileMetadataByKey } from '@/lib/uploads/server/metadata' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' export interface StoredFileProvenanceSource { diff --git a/apps/sim/lib/execution/payloads/materialization.server.test.ts b/apps/sim/lib/execution/payloads/materialization.server.test.ts index 1c3ad6f87fe..53145592dad 100644 --- a/apps/sim/lib/execution/payloads/materialization.server.test.ts +++ b/apps/sim/lib/execution/payloads/materialization.server.test.ts @@ -18,7 +18,7 @@ const { mockReadWorkspaceFileByKey } = vi.hoisted(() => ({ mockReadWorkspaceFileByKey: vi.fn(), })) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/lib/execution/payloads/materialization.server.ts b/apps/sim/lib/execution/payloads/materialization.server.ts index 85f918e295d..1fc17b1f446 100644 --- a/apps/sim/lib/execution/payloads/materialization.server.ts +++ b/apps/sim/lib/execution/payloads/materialization.server.ts @@ -21,14 +21,14 @@ import { import { ExecutionResourceLimitError } from '@/lib/execution/resource-errors' import { createKnowledgeAccessProvider } from '@/lib/knowledge/access/scope' import type { StorageContext } from '@/lib/uploads' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { bufferToBase64, inferContextFromKey, isGeneratedDocumentSourceType, isPublicStorageContext, -} from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { rebindWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import { readStoredWorkspaceFileRecordByKey, diff --git a/apps/sim/lib/execution/preprocessing.test.ts b/apps/sim/lib/execution/preprocessing.test.ts index ce91619c430..a8825b03afa 100644 --- a/apps/sim/lib/execution/preprocessing.test.ts +++ b/apps/sim/lib/execution/preprocessing.test.ts @@ -32,7 +32,7 @@ vi.mock('@sim/utils/helpers', () => utilsHelpersMock) vi.mock('@/lib/auth/ban', () => authBanMock) vi.mock('@/lib/billing/calculations/usage-monitor', () => billingUsageMonitorMock) vi.mock('@/lib/billing/calculations/usage-reservation', () => billingUsageReservationMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) vi.mock('@/lib/core/execution-limits', () => executionLimitsMock) diff --git a/apps/sim/lib/execution/preprocessing.ts b/apps/sim/lib/execution/preprocessing.ts index bfc811ce270..31892008700 100644 --- a/apps/sim/lib/execution/preprocessing.ts +++ b/apps/sim/lib/execution/preprocessing.ts @@ -11,7 +11,7 @@ import { type BillingAttributionSnapshot, resolveBillingAttribution, resolveSystemBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import type { HighestPrioritySubscription } from '@/lib/billing/core/plan' import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-billing.live.test.ts b/apps/sim/lib/execution/remote-sandbox/billing.live.test.ts similarity index 100% rename from apps/sim/lib/execution/remote-sandbox/sandbox-billing.live.test.ts rename to apps/sim/lib/execution/remote-sandbox/billing.live.test.ts diff --git a/apps/sim/lib/execution/remote-sandbox/build-errors.ts b/apps/sim/lib/execution/remote-sandbox/build-errors.ts index 16ca66c6322..1557838f25b 100644 --- a/apps/sim/lib/execution/remote-sandbox/build-errors.ts +++ b/apps/sim/lib/execution/remote-sandbox/build-errors.ts @@ -1,4 +1,4 @@ -import { registryFor, type SandboxLanguage } from '@/lib/execution/remote-sandbox/sandbox-spec' +import { registryFor, type SandboxLanguage } from '@/lib/execution/remote-sandbox/spec' /** * Classified reasons a dependency set failed to materialize. The code is what diff --git a/apps/sim/lib/execution/remote-sandbox/conformance.test.ts b/apps/sim/lib/execution/remote-sandbox/conformance.test.ts index 71d2b1f4f0c..d62d6db26c5 100644 --- a/apps/sim/lib/execution/remote-sandbox/conformance.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/conformance.test.ts @@ -8,7 +8,7 @@ import { Readable } from 'node:stream' import { envMock, setEnv } from '@sim/testing/mocks/env.mock' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { CodeLanguage } from '@/lib/execution/languages' -import { SANDBOX_OUTPUT_DIR_SENTINEL } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_OUTPUT_DIR_SENTINEL } from '@/lib/execution/remote-sandbox/paths' const { mockResolveSandbox, diff --git a/apps/sim/lib/execution/remote-sandbox/daytona.ts b/apps/sim/lib/execution/remote-sandbox/daytona.ts index 0d709dc8ac9..48ed98056bf 100644 --- a/apps/sim/lib/execution/remote-sandbox/daytona.ts +++ b/apps/sim/lib/execution/remote-sandbox/daytona.ts @@ -28,7 +28,7 @@ import { SandboxProcessOutputBudget, tailStreamedSandboxOutput, } from '@/lib/execution/remote-sandbox/output-limits' -import { resolveSandboxDirectoryEntryPath } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { resolveSandboxDirectoryEntryPath } from '@/lib/execution/remote-sandbox/paths' import type { CreateSandboxOptions, RunCommandOptions, diff --git a/apps/sim/lib/execution/remote-sandbox/e2b-session.test.ts b/apps/sim/lib/execution/remote-sandbox/e2b-session.test.ts index 55b5f05660d..6c9611e3c26 100644 --- a/apps/sim/lib/execution/remote-sandbox/e2b-session.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/e2b-session.test.ts @@ -50,7 +50,7 @@ import { e2bProvider, stopE2BSessionProcess, } from '@/lib/execution/remote-sandbox/e2b' -import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/observer' setEnv({ E2B_API_KEY: 'test', MOTHERSHIP_E2B_TEMPLATE_ID: 'mothership-template' }) diff --git a/apps/sim/lib/execution/remote-sandbox/e2b.ts b/apps/sim/lib/execution/remote-sandbox/e2b.ts index 8ce6da00bc0..bc27ce5e20b 100644 --- a/apps/sim/lib/execution/remote-sandbox/e2b.ts +++ b/apps/sim/lib/execution/remote-sandbox/e2b.ts @@ -29,16 +29,16 @@ import { sandboxCliVerificationCommand, } from '@/lib/execution/remote-sandbox/cli-tools.server' import { processCodeFailure } from '@/lib/execution/remote-sandbox/code-failure' -import { - recordSandboxProcess, - reportUnsettledSandboxProcess, - settleSandboxProcess, -} from '@/lib/execution/remote-sandbox/execution-observer' import { FUNCTION_SANDBOX_CPU_COUNT, FUNCTION_SANDBOX_MATERIALIZER_REVISION, FUNCTION_SANDBOX_MEMORY_MB, } from '@/lib/execution/remote-sandbox/function-resources' +import { + recordSandboxProcess, + reportUnsettledSandboxProcess, + settleSandboxProcess, +} from '@/lib/execution/remote-sandbox/observer' import { assertSandboxProcessOutputWithinLimit, isSandboxOutputLimitError, @@ -49,20 +49,20 @@ import { SandboxProcessOutputBudget, tailStreamedSandboxOutput, } from '@/lib/execution/remote-sandbox/output-limits' -import { resolveSandboxDirectoryEntryPath } from '@/lib/execution/remote-sandbox/sandbox-paths' -import { - quoteDependency, - type SandboxSpec, - SIM_DEPS_DIR, - SIM_NODE_MODULES_DIR, - systemPackageInstallCommand, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +import { resolveSandboxDirectoryEntryPath } from '@/lib/execution/remote-sandbox/paths' import { withSandboxSessionLock } from '@/lib/execution/remote-sandbox/session-lock' import { type SessionProcessIdentity, sessionProcessCommand, sessionProcessStopCommand, } from '@/lib/execution/remote-sandbox/session-process' +import { + quoteDependency, + type SandboxSpec, + SIM_DEPS_DIR, + SIM_NODE_MODULES_DIR, + systemPackageInstallCommand, +} from '@/lib/execution/remote-sandbox/spec' import type { CreateSandboxOptions, RunCommandOptions, diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-encoding.test.ts b/apps/sim/lib/execution/remote-sandbox/encoding.test.ts similarity index 97% rename from apps/sim/lib/execution/remote-sandbox/sandbox-encoding.test.ts rename to apps/sim/lib/execution/remote-sandbox/encoding.test.ts index e1005efda5d..bdbc5f2e9d1 100644 --- a/apps/sim/lib/execution/remote-sandbox/sandbox-encoding.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/encoding.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/sandbox-encoding' +import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/encoding' describe('isBinarySandboxPath', () => { it('treats image, document, and archive extensions as binary regardless of case', () => { diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-encoding.ts b/apps/sim/lib/execution/remote-sandbox/encoding.ts similarity index 100% rename from apps/sim/lib/execution/remote-sandbox/sandbox-encoding.ts rename to apps/sim/lib/execution/remote-sandbox/encoding.ts diff --git a/apps/sim/lib/execution/remote-sandbox/fellows-digest.test.ts b/apps/sim/lib/execution/remote-sandbox/fellows-digest.test.ts index d1fbea72158..7ac64228513 100644 --- a/apps/sim/lib/execution/remote-sandbox/fellows-digest.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/fellows-digest.test.ts @@ -15,7 +15,7 @@ import { hashSandboxSpec, SIM_REQUIREMENTS_PATH, validateDependencies, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +} from '@/lib/execution/remote-sandbox/spec' import type { SandboxCommandResult, SandboxHandle } from '@/lib/execution/remote-sandbox/types' const CLI_TOOL_ID = 'google-cloud-cli@577.0.0-r1' as const diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-files.live.test.ts b/apps/sim/lib/execution/remote-sandbox/files.live.test.ts similarity index 99% rename from apps/sim/lib/execution/remote-sandbox/sandbox-files.live.test.ts rename to apps/sim/lib/execution/remote-sandbox/files.live.test.ts index 17e55773218..7cd3b78a03d 100644 --- a/apps/sim/lib/execution/remote-sandbox/sandbox-files.live.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/files.live.test.ts @@ -19,7 +19,7 @@ import { executeShellInSandbox, SIM_RESULT_PREFIX, } from '@/lib/execution/remote-sandbox' -import { SANDBOX_INPUT_DIR, SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_INPUT_DIR, SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/paths' const smokeEnabled = process.env.SANDBOX_FILES_SMOKE === '1' const CASE_TIMEOUT_MS = 5 * 60_000 diff --git a/apps/sim/lib/execution/remote-sandbox/image-registry.ts b/apps/sim/lib/execution/remote-sandbox/image-registry.ts index 3f80df3786f..bfbadb008ee 100644 --- a/apps/sim/lib/execution/remote-sandbox/image-registry.ts +++ b/apps/sim/lib/execution/remote-sandbox/image-registry.ts @@ -19,7 +19,7 @@ import { } from '@/lib/execution/remote-sandbox/build-errors' import { resolveProvider } from '@/lib/execution/remote-sandbox/provider' import { invalidateSandboxResolution } from '@/lib/execution/remote-sandbox/resolve' -import type { SandboxSpec } from '@/lib/execution/remote-sandbox/sandbox-spec' +import type { SandboxSpec } from '@/lib/execution/remote-sandbox/spec' import { SANDBOX_BASE_RELEASE_REFRESH_CODE, type SandboxImageBuild, diff --git a/apps/sim/lib/execution/remote-sandbox/index.ts b/apps/sim/lib/execution/remote-sandbox/index.ts index 16b8fa7547b..3ddf05b05b7 100644 --- a/apps/sim/lib/execution/remote-sandbox/index.ts +++ b/apps/sim/lib/execution/remote-sandbox/index.ts @@ -16,13 +16,14 @@ import { createSandbox, createSelectedSandbox, } from '@/lib/execution/remote-sandbox/create' +import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/encoding' +import { withSandboxFilePublication } from '@/lib/execution/remote-sandbox/file-publication' import { prepareSandboxSessionAccess, reportUnsettledSandboxProcess, retainSandboxExecution, sandboxSessionInputProvenance, -} from '@/lib/execution/remote-sandbox/execution-observer' -import { withSandboxFilePublication } from '@/lib/execution/remote-sandbox/file-publication' +} from '@/lib/execution/remote-sandbox/observer' import { attachTrustedSandboxOutputCost, isSandboxOutputFileError, @@ -37,6 +38,10 @@ import { SandboxOutputFileCountError, SandboxOutputLimitError, } from '@/lib/execution/remote-sandbox/output-limits' +import { + SANDBOX_OUTPUT_DIR_MAX_DEPTH, + SANDBOX_OUTPUT_DIR_SENTINEL, +} from '@/lib/execution/remote-sandbox/paths' import { resolvePiSandboxLifetimeMs } from '@/lib/execution/remote-sandbox/pi-lifetime' import { resolveProvider } from '@/lib/execution/remote-sandbox/provider' import { @@ -45,11 +50,6 @@ import { RUNTIME_INSTALL_TIMEOUT_MS, resolveWorkspaceSandbox, } from '@/lib/execution/remote-sandbox/resolve' -import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/sandbox-encoding' -import { - SANDBOX_OUTPUT_DIR_MAX_DEPTH, - SANDBOX_OUTPUT_DIR_SENTINEL, -} from '@/lib/execution/remote-sandbox/sandbox-paths' import { ensureSessionSandbox, SESSION_SANDBOX_IDLE_MS, diff --git a/apps/sim/lib/execution/remote-sandbox/execution-observer.ts b/apps/sim/lib/execution/remote-sandbox/observer.ts similarity index 100% rename from apps/sim/lib/execution/remote-sandbox/execution-observer.ts rename to apps/sim/lib/execution/remote-sandbox/observer.ts diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-paths.ts b/apps/sim/lib/execution/remote-sandbox/paths.ts similarity index 100% rename from apps/sim/lib/execution/remote-sandbox/sandbox-paths.ts rename to apps/sim/lib/execution/remote-sandbox/paths.ts diff --git a/apps/sim/lib/execution/remote-sandbox/resolve.ts b/apps/sim/lib/execution/remote-sandbox/resolve.ts index 184ec2f4562..c73e4ab0661 100644 --- a/apps/sim/lib/execution/remote-sandbox/resolve.ts +++ b/apps/sim/lib/execution/remote-sandbox/resolve.ts @@ -29,7 +29,7 @@ import { SIM_REQUIREMENTS_PATH, systemPackageInstallCommand, validateSystemPackages, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +} from '@/lib/execution/remote-sandbox/spec' import { SANDBOX_BASE_RELEASE_REFRESH_CODE, type SandboxDependencyStrategy, diff --git a/apps/sim/lib/execution/remote-sandbox/session-file-snapshot.ts b/apps/sim/lib/execution/remote-sandbox/session-file-snapshot.ts index 07ee646f36c..cd067293fee 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-file-snapshot.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-file-snapshot.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { generateShortId } from '@sim/utils/id' import type { EmbeddedFileSnapshot } from 'sim/embed' -import { prepareSandboxSessionAccess } from '@/lib/execution/remote-sandbox/execution-observer' +import { prepareSandboxSessionAccess } from '@/lib/execution/remote-sandbox/observer' import { resolveProvider } from '@/lib/execution/remote-sandbox/provider' import { SESSION_SANDBOX_IDLE_MS } from '@/lib/execution/remote-sandbox/session' import type { SessionFileObserver } from '@/lib/execution/remote-sandbox/session-file-observer' diff --git a/apps/sim/lib/execution/remote-sandbox/session-file-uploads.test.ts b/apps/sim/lib/execution/remote-sandbox/session-file-uploads.test.ts index d02da2d7cb3..537d7dbb069 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-file-uploads.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-file-uploads.test.ts @@ -34,7 +34,7 @@ vi.mock('@/lib/execution/remote-sandbox/session-lock', () => ({ }, })) -import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/observer' import { runCli } from '@/lib/mothership/agent-cli/run-cli' const IDENTITY = { endpoint: 'https://sim.test', apiKey: 'fixture', workspaceId: 'workspace' } diff --git a/apps/sim/lib/execution/remote-sandbox/session-files.test.ts b/apps/sim/lib/execution/remote-sandbox/session-files.test.ts index 6d29d073036..da7e5b6de6c 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-files.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-files.test.ts @@ -34,7 +34,7 @@ vi.mock('@/lib/execution/remote-sandbox/session-lock', () => ({ }, })) -import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/observer' import { SandboxOutputLimitError } from '@/lib/execution/remote-sandbox/output-limits' import { readSessionSecretProvenance } from '@/lib/execution/remote-sandbox/session-file-provenance' import { diff --git a/apps/sim/lib/execution/remote-sandbox/session-files.ts b/apps/sim/lib/execution/remote-sandbox/session-files.ts index 02bbe1597f6..c56ef365070 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-files.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-files.ts @@ -3,8 +3,8 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { isPayloadSizeLimitError, PayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import type { DurableSecretProvenance } from '@/lib/execution/durable-secret-provenance' -import { prepareSandboxSessionAccess } from '@/lib/execution/remote-sandbox/execution-observer' import { withSandboxFilePublication } from '@/lib/execution/remote-sandbox/file-publication' +import { prepareSandboxSessionAccess } from '@/lib/execution/remote-sandbox/observer' import { isSandboxOutputLimitError } from '@/lib/execution/remote-sandbox/output-limits' import { resolveProvider } from '@/lib/execution/remote-sandbox/provider' import { diff --git a/apps/sim/lib/execution/remote-sandbox/session-input-certification.integration.ts b/apps/sim/lib/execution/remote-sandbox/session-input-certification.integration.ts index 703e0354186..07b3311f34b 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-input-certification.integration.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-input-certification.integration.ts @@ -38,7 +38,7 @@ import { executeShellInSandbox, SIM_RESULT_PREFIX, } from '@/lib/execution/remote-sandbox' -import { observeSandboxSessionInputs } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxSessionInputs } from '@/lib/execution/remote-sandbox/observer' import { initializeSessionFileProvenance, isSessionFileProvenanceClean, diff --git a/apps/sim/lib/execution/remote-sandbox/session-sandbox.test.ts b/apps/sim/lib/execution/remote-sandbox/session-sandbox.test.ts index 8e715609bb0..24c702d03a4 100644 --- a/apps/sim/lib/execution/remote-sandbox/session-sandbox.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/session-sandbox.test.ts @@ -13,7 +13,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { sleep } from '@sim/utils/helpers' import { beforeEach, describe, expect, it, vi } from 'vitest' import { CodeLanguage } from '@/lib/execution/languages' -import { SANDBOX_OUTPUT_DIR_SENTINEL } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_OUTPUT_DIR_SENTINEL } from '@/lib/execution/remote-sandbox/paths' import type { SandboxCodeResult, SandboxCommandResult, @@ -49,7 +49,7 @@ import { import { observeSandboxExecution, observeSandboxSessionInputs, -} from '@/lib/execution/remote-sandbox/execution-observer' +} from '@/lib/execution/remote-sandbox/observer' import { initializeSessionFileProvenance, recordSessionFileInput, diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-spec.test.ts b/apps/sim/lib/execution/remote-sandbox/spec.test.ts similarity index 99% rename from apps/sim/lib/execution/remote-sandbox/sandbox-spec.test.ts rename to apps/sim/lib/execution/remote-sandbox/spec.test.ts index 9fe19be82d8..e75e50ee382 100644 --- a/apps/sim/lib/execution/remote-sandbox/sandbox-spec.test.ts +++ b/apps/sim/lib/execution/remote-sandbox/spec.test.ts @@ -15,7 +15,7 @@ import { systemPackageInstallCommand, validateDependencies, validateSystemPackages, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +} from '@/lib/execution/remote-sandbox/spec' const PY = CodeLanguage.Python const JS = CodeLanguage.JavaScript diff --git a/apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts b/apps/sim/lib/execution/remote-sandbox/spec.ts similarity index 100% rename from apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts rename to apps/sim/lib/execution/remote-sandbox/spec.ts diff --git a/apps/sim/lib/execution/remote-sandbox/types.ts b/apps/sim/lib/execution/remote-sandbox/types.ts index 570723e577e..47f48edc5e0 100644 --- a/apps/sim/lib/execution/remote-sandbox/types.ts +++ b/apps/sim/lib/execution/remote-sandbox/types.ts @@ -2,7 +2,7 @@ import type { CodePlaceholderRuntimeBinding } from '@/lib/execution/code-placeho import type { DurableSecretProvenance } from '@/lib/execution/durable-secret-provenance' import type { CodeLanguage } from '@/lib/execution/languages' import type { SandboxBuildError } from '@/lib/execution/remote-sandbox/build-errors' -import type { SandboxSpec } from '@/lib/execution/remote-sandbox/sandbox-spec' +import type { SandboxSpec } from '@/lib/execution/remote-sandbox/spec' /** * Which vetted image a sandbox runs in. Every kind fails closed when its diff --git a/apps/sim/lib/execution/remote-sandbox/wand-enricher.ts b/apps/sim/lib/execution/remote-sandbox/wand-enricher.ts index dfc02c9509b..4d66bcaab59 100644 --- a/apps/sim/lib/execution/remote-sandbox/wand-enricher.ts +++ b/apps/sim/lib/execution/remote-sandbox/wand-enricher.ts @@ -14,7 +14,7 @@ import { parseJsDependency, registryFor, type SandboxLanguage, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +} from '@/lib/execution/remote-sandbox/spec' const logger = createLogger('SandboxWandEnricher') diff --git a/apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts b/apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts index b24a5cd5567..d621899e7ea 100644 --- a/apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts +++ b/apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts @@ -37,7 +37,7 @@ import { type SystemPackageIssue, validateDependencies, validateSystemPackages, -} from '@/lib/execution/remote-sandbox/sandbox-spec' +} from '@/lib/execution/remote-sandbox/spec' import type { SandboxDependencyStrategy } from '@/lib/execution/remote-sandbox/types' /** diff --git a/apps/sim/lib/execution/sandbox/__integration__/content-reads.integration.ts b/apps/sim/lib/execution/sandbox/__integration__/content-reads.integration.ts index 988ec28f3c1..45384d6dba0 100644 --- a/apps/sim/lib/execution/sandbox/__integration__/content-reads.integration.ts +++ b/apps/sim/lib/execution/sandbox/__integration__/content-reads.integration.ts @@ -32,8 +32,8 @@ import { compileDocForWrite } from '@/lib/mothership/tools/server/files/workspac import { updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { getBoundWorkspaceFileSecretProvenanceByIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { getBoundWorkspaceFileSecretProvenanceByIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { compileDoc } from '@/lib/uploads/documents/compile' import { projectResolvedSecretModelContent } from '@/executor/utils/resolved-secret-content-projection' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/execution/sandbox/brokers/workspace-file.test.ts b/apps/sim/lib/execution/sandbox/brokers/workspace-file.test.ts index 46746d0a252..7cf90d7c552 100644 --- a/apps/sim/lib/execution/sandbox/brokers/workspace-file.test.ts +++ b/apps/sim/lib/execution/sandbox/brokers/workspace-file.test.ts @@ -4,7 +4,7 @@ import { } from '@sim/testing/mocks/workspace-file-manager.mock' import { describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { MAX_ISOLATED_VM_BROKER_RESULT_JSON_CHARS, diff --git a/apps/sim/lib/execution/sandbox/brokers/workspace-file.ts b/apps/sim/lib/execution/sandbox/brokers/workspace-file.ts index 6be2e8196df..83cac379378 100644 --- a/apps/sim/lib/execution/sandbox/brokers/workspace-file.ts +++ b/apps/sim/lib/execution/sandbox/brokers/workspace-file.ts @@ -7,7 +7,7 @@ import type { SandboxBroker } from '@/lib/execution/sandbox/types' import { fetchWorkspaceFileBuffer, getWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' const logger = createLogger('SandboxWorkspaceFileBroker') diff --git a/apps/sim/lib/execution/sandbox/run-task.ts b/apps/sim/lib/execution/sandbox/run-task.ts index 7e09020b196..78bdac1bf3d 100644 --- a/apps/sim/lib/execution/sandbox/run-task.ts +++ b/apps/sim/lib/execution/sandbox/run-task.ts @@ -8,7 +8,7 @@ import { type IsolatedVMExecutionRequest, } from '@/lib/execution/isolated-vm' import type { SandboxBrokerContext, SandboxTaskInput } from '@/lib/execution/sandbox/types' -import { getSandboxTask, type SandboxTaskId } from '@/sandbox-tasks/registry' +import { getSandboxTask, type SandboxTaskId } from '@/sandboxes/registry' const logger = createLogger('SandboxRunTask') diff --git a/apps/sim/lib/execution/execution-signal.test.ts b/apps/sim/lib/execution/signal.test.ts similarity index 99% rename from apps/sim/lib/execution/execution-signal.test.ts rename to apps/sim/lib/execution/signal.test.ts index 67538a0195b..c9fbd7006fc 100644 --- a/apps/sim/lib/execution/execution-signal.test.ts +++ b/apps/sim/lib/execution/signal.test.ts @@ -38,7 +38,7 @@ import { connectExecutionSignalHub, getExecutionSignalHub, publishLocalExecutionSignal, -} from '@/lib/execution/execution-signal' +} from '@/lib/execution/signal' redisConfigMockFns.mockGetConfiguredRedisUrl.mockImplementation(() => { if (mockRedisUrl.error) throw mockRedisUrl.error diff --git a/apps/sim/lib/execution/execution-signal.ts b/apps/sim/lib/execution/signal.ts similarity index 100% rename from apps/sim/lib/execution/execution-signal.ts rename to apps/sim/lib/execution/signal.ts diff --git a/apps/sim/lib/file-parsers/parser-formats.test.ts b/apps/sim/lib/file-parsers/formats.test.ts similarity index 100% rename from apps/sim/lib/file-parsers/parser-formats.test.ts rename to apps/sim/lib/file-parsers/formats.test.ts diff --git a/apps/sim/lib/file-retention/folders.ts b/apps/sim/lib/file-retention/folders.ts index 2ff36b9e76d..14ce9eb5e04 100644 --- a/apps/sim/lib/file-retention/folders.ts +++ b/apps/sim/lib/file-retention/folders.ts @@ -13,7 +13,7 @@ import { isolateOwnerFailure } from '@/lib/file-retention/failure' import { FILES_PER_QUERY } from '@/lib/file-retention/versions' import { deduplicateFolderNameInScope } from '@/lib/folders/naming' import { lockWorkspaceProject } from '@/lib/projects/membership' -import { workspaceFileNameFolderCondition } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { workspaceFileNameFolderCondition } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { lockFileDirectories } from '@/lib/workspace-files/locks' import type { EditableFileOwner } from '@/lib/workspace-files/ownership' import { fileFolderOwnerCondition, fileOwnerCondition } from '@/lib/workspace-files/ownership-query' diff --git a/apps/sim/lib/file-retention/legacy-archive.ts b/apps/sim/lib/file-retention/legacy-archive.ts index dc9dd75c426..28e1b5afa7a 100644 --- a/apps/sim/lib/file-retention/legacy-archive.ts +++ b/apps/sim/lib/file-retention/legacy-archive.ts @@ -10,8 +10,8 @@ import { type CleanupOwnerScope, cleanupOwnerCondition } from '@/lib/cleanup/res import { cleanupArchivedWorkspaceFileFolders } from '@/lib/file-retention/folders' import type { FileArchiveCleanup, FileRetentionOptions } from '@/lib/file-retention/types' import { isUsingCloudStorage, type StorageContext, StorageService } from '@/lib/uploads' -import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' -import { releaseWorkspaceFileVersionsForPurgeInTx } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' +import { releaseWorkspaceFileVersionsForPurgeInTx } from '@/lib/uploads/contexts/workspace/file-version-store' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' const logger = createLogger('FileArchiveCleanup') diff --git a/apps/sim/lib/file-retention/versions.ts b/apps/sim/lib/file-retention/versions.ts index d2c0e65a42f..544a1566370 100644 --- a/apps/sim/lib/file-retention/versions.ts +++ b/apps/sim/lib/file-retention/versions.ts @@ -2,7 +2,7 @@ import type { db } from '@sim/db' import { workspaceFileVersion } from '@sim/db/schema' import { and, gt, inArray, isNotNull, lt, or, sql } from 'drizzle-orm' import type { DbTransaction } from '@/lib/db/types' -import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' /** Always retain the current head and its newest nine predecessors. */ export const KEEP_SUPERSEDED = 9 diff --git a/apps/sim/lib/file-retention/workspace-versions.ts b/apps/sim/lib/file-retention/workspace-versions.ts index 29a42f72c58..971b99cbed4 100644 --- a/apps/sim/lib/file-retention/workspace-versions.ts +++ b/apps/sim/lib/file-retention/workspace-versions.ts @@ -15,7 +15,7 @@ import { releaseExpiredFileVersions, selectExpiredFileVersions, } from '@/lib/file-retention/versions' -import { MAX_SUPERSEDED_FILE_VERSIONS } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { MAX_SUPERSEDED_FILE_VERSIONS } from '@/lib/uploads/contexts/workspace/file-version-store' const cleanupDb = dbFor('cleanup') diff --git a/apps/sim/lib/folders/application-folder-caps.test.ts b/apps/sim/lib/folders/application-folder-caps.test.ts index 14d0a77b38c..de041e946ef 100644 --- a/apps/sim/lib/folders/application-folder-caps.test.ts +++ b/apps/sim/lib/folders/application-folder-caps.test.ts @@ -24,19 +24,19 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/folders/queries', () => folderQueriesMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/queries', () => workflowsQueriesMock) vi.mock('@/lib/table/application/context', () => tableApplicationContextMock) vi.mock('@/lib/table', () => tableMock) vi.mock('@/lib/table/events', () => tableEventsMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { listTableFoldersUseCase } from '@/lib/table/application/folders' import { listTablesUseCase } from '@/lib/table/application/tables' +import { listWorkflowFolders } from '@/lib/workflows/application/folders' import { listWorkflows } from '@/lib/workflows/application/list-workflows' -import { listWorkflowFolders } from '@/lib/workflows/application/workflow-folders' import { queryWorkspaceFilePage } from '@/lib/workspace-files/application/list-workspace-files' const mocks = { diff --git a/apps/sim/lib/folders/config.ts b/apps/sim/lib/folders/config.ts index bb5c2640674..cb6b542cf32 100644 --- a/apps/sim/lib/folders/config.ts +++ b/apps/sim/lib/folders/config.ts @@ -488,7 +488,7 @@ export const FOLDER_RESOURCES: Record /** * Present to satisfy the total `Record`, but UNREACHABLE at runtime: * `servedFolderResourceTypeSchema` does not serve `'file'`, and the Files surface goes through - * `workspace-file-folder-manager.ts` instead. Do not treat this entry as a live path — routing + * `uploads/contexts/workspace/file-folder-manager.ts` instead. Do not treat this entry as a live path — routing * file folders through the generic engine would bypass the `workspace_file_folders:` advisory * lock that makes its check-then-write pairs atomic, and the name rules that keep a folder name * usable as a path segment. diff --git a/apps/sim/lib/function-execution/application/authorization.ts b/apps/sim/lib/function-execution/application/authorization.ts index 87f793ca059..8a8775e04cc 100644 --- a/apps/sim/lib/function-execution/application/authorization.ts +++ b/apps/sim/lib/function-execution/application/authorization.ts @@ -1,5 +1,5 @@ import type { DelegatedPrincipal } from '@sim/auth/principal' -import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const FUNCTION_EXECUTION_DELEGATION_AUDIENCE = 'sim:function-executions' diff --git a/apps/sim/lib/function-execution/application/execute-function.test.ts b/apps/sim/lib/function-execution/application/execute-function.test.ts index 73934ca35fe..81cbc828525 100644 --- a/apps/sim/lib/function-execution/application/execute-function.test.ts +++ b/apps/sim/lib/function-execution/application/execute-function.test.ts @@ -14,7 +14,7 @@ vi.mock('@/lib/function-execution/execute-request', () => ({ executeFunctionRequest: hoisted.executeRequest, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/function-execution/application/execute-function.ts b/apps/sim/lib/function-execution/application/execute-function.ts index c5a8e2998c4..2e5fbf3b713 100644 --- a/apps/sim/lib/function-execution/application/execute-function.ts +++ b/apps/sim/lib/function-execution/application/execute-function.ts @@ -4,7 +4,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { functionExecutionDelegationPolicy } from '@/lib/function-execution/application/authorization' import { functionExecutionOperations } from '@/lib/function-execution/application/operations' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' export interface ExecuteFunctionInput { diff --git a/apps/sim/lib/function-execution/execute-request.test.ts b/apps/sim/lib/function-execution/execute-request.test.ts index bacf6bb0c47..eb9ebabc528 100644 --- a/apps/sim/lib/function-execution/execute-request.test.ts +++ b/apps/sim/lib/function-execution/execute-request.test.ts @@ -26,7 +26,7 @@ import { NextRequest } from 'next/server' import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' import { functionExecuteBodySchema } from '@/lib/api/contracts' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { INTERNAL_EXECUTION_DEADLINE_HEADER } from '@/lib/execution/execution-deadline-header' +import { INTERNAL_EXECUTION_DEADLINE_HEADER } from '@/lib/execution/deadline-header' import { MOUNTED_WORKSPACE_FILES_PROVENANCE_KEY, PRIVATE_SECRET_PROVENANCE_BUNDLE_V1, @@ -115,7 +115,7 @@ vi.mock('@/lib/mothership/vfs/resource-writer', () => ({ writeWorkspaceFileByPath: mockWriteWorkspaceFileByPath, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( '@/lib/workspace-files/application/resolve-workspace-file-reference', @@ -132,7 +132,7 @@ vi.mock('@/lib/workspace-files/application/read-workspace-file-content', () => ( vi.mock('@/lib/uploads', () => uploadsMock) -vi.mock('@/lib/uploads/contexts/execution/execution-file-manager', () => ({ +vi.mock('@/lib/uploads/contexts/execution/file-manager', () => ({ uploadExecutionFile: mockUploadExecutionFile, })) diff --git a/apps/sim/lib/function-execution/execute-request.ts b/apps/sim/lib/function-execution/execute-request.ts index 05584300c7a..cc99363f6e3 100644 --- a/apps/sim/lib/function-execution/execute-request.ts +++ b/apps/sim/lib/function-execution/execute-request.ts @@ -27,13 +27,13 @@ import { type CompiledCodePlaceholders, compileCodePlaceholders, } from '@/lib/execution/code-placeholders' +import { parseExecutionDeadlineHeader } from '@/lib/execution/deadline-header' import { type DurableSecretProvenance, durableSecretProvenanceFromEnvelope, importDurableSecretProvenance, mergeDurableSecretProvenance, } from '@/lib/execution/durable-secret-provenance' -import { parseExecutionDeadlineHeader } from '@/lib/execution/execution-deadline-header' import { executeInIsolatedVM, type IsolatedVMBrokerHandler } from '@/lib/execution/isolated-vm' import { CodeLanguage, DEFAULT_CODE_LANGUAGE, isValidCodeLanguage } from '@/lib/execution/languages' import { @@ -80,7 +80,8 @@ import { executeShellInSandbox, SIM_RESULT_PREFIX, } from '@/lib/execution/remote-sandbox' -import { sandboxSessionInputProvenance } from '@/lib/execution/remote-sandbox/execution-observer' +import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/encoding' +import { sandboxSessionInputProvenance } from '@/lib/execution/remote-sandbox/observer' import { isSandboxOutputFileError, isSandboxOutputLimitError, @@ -88,11 +89,7 @@ import { MAX_SANDBOX_OUTPUT_BYTES, readTrustedSandboxOutputCost, } from '@/lib/execution/remote-sandbox/output-limits' -import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/sandbox-encoding' -import { - MAX_BLOCK_MOUNTED_FILES, - SANDBOX_OUTPUT_DIR, -} from '@/lib/execution/remote-sandbox/sandbox-paths' +import { MAX_BLOCK_MOUNTED_FILES, SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/paths' import type { SandboxCollectedFile, SandboxFile, @@ -115,7 +112,7 @@ import { validateWorkspaceFileWriteTarget, writeWorkspaceFileByPath, } from '@/lib/mothership/vfs/resource-writer' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' import { createWorkspaceFileSecretProvenanceFromRegistry, EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE, @@ -124,9 +121,9 @@ import { mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFiles } from '@/lib/uploads/core/storage-service' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { getWorkflowById } from '@/lib/workflows/utils' import { rebindWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import { fileOperations } from '@/lib/workspace-files/application/operations' diff --git a/apps/sim/lib/function-execution/sandbox-mounts.test.ts b/apps/sim/lib/function-execution/sandbox-mounts.test.ts index 570649e2008..6e9b19b26b2 100644 --- a/apps/sim/lib/function-execution/sandbox-mounts.test.ts +++ b/apps/sim/lib/function-execution/sandbox-mounts.test.ts @@ -24,7 +24,7 @@ const { mockReadWorkspaceFileRecordByKey } = vi.hoisted(() => ({ vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( '@/lib/workspace-files/application/read-stored-workspace-file-record-by-key', diff --git a/apps/sim/lib/function-execution/sandbox-mounts.ts b/apps/sim/lib/function-execution/sandbox-mounts.ts index 3e632caac77..9f99c2cfc38 100644 --- a/apps/sim/lib/function-execution/sandbox-mounts.ts +++ b/apps/sim/lib/function-execution/sandbox-mounts.ts @@ -7,16 +7,13 @@ import { readUserFileContentWithContributors, } from '@/lib/execution/payloads/materialization.server' import { MAX_SANDBOX_URL_MOUNT_BYTES } from '@/lib/execution/remote-sandbox/output-limits' -import { SANDBOX_INPUT_DIR } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_INPUT_DIR } from '@/lib/execution/remote-sandbox/paths' import type { SandboxFile } from '@/lib/execution/remote-sandbox/types' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { buildStorageKeySegment } from '@/lib/uploads/core/storage-key' import { generatePresignedDownloadUrl, hasCloudStorage } from '@/lib/uploads/core/storage-service' import type { StorageContext } from '@/lib/uploads/shared/types' -import { - isGeneratedDocumentSourceType, - resolveTrustedFileContext, -} from '@/lib/uploads/utils/file-utils' +import { isGeneratedDocumentSourceType, resolveTrustedFileContext } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' const logger = createLogger('SandboxMounts') diff --git a/apps/sim/lib/guardrails/validate-hallucination.test.ts b/apps/sim/lib/guardrails/validate-hallucination.test.ts index 536412940f4..f3ebfa761c6 100644 --- a/apps/sim/lib/guardrails/validate-hallucination.test.ts +++ b/apps/sim/lib/guardrails/validate-hallucination.test.ts @@ -2,7 +2,7 @@ import { encryptionMock, encryptionMockFns } from '@sim/testing/mocks/encryption import { providersMock, providersMockFns } from '@sim/testing/mocks/providers.mock' import { providersUtilsMock } from '@sim/testing/mocks/providers-utils.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' const { mockSearchKnowledgeAsExecutor } = vi.hoisted(() => ({ mockSearchKnowledgeAsExecutor: vi.fn(), diff --git a/apps/sim/lib/guardrails/validate-hallucination.ts b/apps/sim/lib/guardrails/validate-hallucination.ts index a0c0070ef22..cf21d8d8648 100644 --- a/apps/sim/lib/guardrails/validate-hallucination.ts +++ b/apps/sim/lib/guardrails/validate-hallucination.ts @@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { isPlainRecord } from '@sim/utils/object' import { eq } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { searchKnowledgeAsExecutor } from '@/lib/internal/knowledge/search' import type { InternalToolOperationContext } from '@/lib/internal/tool-operations/types' import { refreshTokenIfNeeded } from '@/lib/oauth/credential-service' diff --git a/apps/sim/lib/internal/a2a/operations.test.ts b/apps/sim/lib/internal/a2a/operations.test.ts index ed89d6c5b41..69eced30bcf 100644 --- a/apps/sim/lib/internal/a2a/operations.test.ts +++ b/apps/sim/lib/internal/a2a/operations.test.ts @@ -37,10 +37,10 @@ vi.mock('@/lib/execution/model-input-provenance', () => ({ })) vi.mock('@/lib/uploads/shared/types', () => ({ MAX_BUFFERED_TRANSFER_BYTES: 5 })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/lib/internal/a2a/operations.ts b/apps/sim/lib/internal/a2a/operations.ts index e05d8a0d920..df31b497e71 100644 --- a/apps/sim/lib/internal/a2a/operations.ts +++ b/apps/sim/lib/internal/a2a/operations.ts @@ -21,10 +21,10 @@ import type { import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('A2AOperations') diff --git a/apps/sim/lib/internal/agiloft/file-input.test.ts b/apps/sim/lib/internal/agiloft/file-input.test.ts index c8d4dad1b14..2d302484ef4 100644 --- a/apps/sim/lib/internal/agiloft/file-input.test.ts +++ b/apps/sim/lib/internal/agiloft/file-input.test.ts @@ -21,8 +21,8 @@ vi.mock('@/lib/core/utils/stream-limits', () => ({ vi.mock('@/lib/uploads/shared/types', () => ({ MAX_BUFFERED_TRANSFER_BYTES: 50 * 1024 * 1024, })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/utils/servable-file-response', () => ({ docNotReadyResponse: fileMocks.docNotReadyResponse, })) diff --git a/apps/sim/lib/internal/agiloft/file-input.ts b/apps/sim/lib/internal/agiloft/file-input.ts index b3b71d13ee1..fb7d941ed55 100644 --- a/apps/sim/lib/internal/agiloft/file-input.ts +++ b/apps/sim/lib/internal/agiloft/file-input.ts @@ -3,9 +3,9 @@ import { toError } from '@sim/utils/errors' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { AgiloftOperationError } from '@/lib/internal/agiloft/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { parseRawFileInput, type RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/agiloft/operations.ts b/apps/sim/lib/internal/agiloft/operations.ts index 0879b2f541a..95134bc1796 100644 --- a/apps/sim/lib/internal/agiloft/operations.ts +++ b/apps/sim/lib/internal/agiloft/operations.ts @@ -69,7 +69,7 @@ import { createInternalToolFileResult, type InternalToolFileResult, } from '@/lib/internal/tool-operations/file-result' -import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file' import type { AgiloftAsyncStatusResponse, AgiloftAttachmentInfoResponse, diff --git a/apps/sim/lib/internal/ashby/operations.test.ts b/apps/sim/lib/internal/ashby/operations.test.ts index f1883ac035b..c85f91753fe 100644 --- a/apps/sim/lib/internal/ashby/operations.test.ts +++ b/apps/sim/lib/internal/ashby/operations.test.ts @@ -14,7 +14,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { PayloadSizeLimitError } from '@/lib/core/utils/stream-limits' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns diff --git a/apps/sim/lib/internal/ashby/operations.ts b/apps/sim/lib/internal/ashby/operations.ts index ee327909f80..125f8289097 100644 --- a/apps/sim/lib/internal/ashby/operations.ts +++ b/apps/sim/lib/internal/ashby/operations.ts @@ -13,8 +13,8 @@ import { } from '@/lib/core/utils/stream-limits' import type { AshbyUploadInput } from '@/lib/internal/ashby/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { ashbyAuthHeaders, ashbyErrorMessage, mapCandidate } from '@/tools/ashby/utils' diff --git a/apps/sim/lib/internal/box/operations.test.ts b/apps/sim/lib/internal/box/operations.test.ts index 0b2a8edccad..0329a1647fd 100644 --- a/apps/sim/lib/internal/box/operations.test.ts +++ b/apps/sim/lib/internal/box/operations.test.ts @@ -33,8 +33,8 @@ vi.mock('@/lib/internal/box/client', () => { return { BoxClient, BoxUploadError } }) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) const { mockProcessFilesToUserFiles } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/box/operations.ts b/apps/sim/lib/internal/box/operations.ts index 773f49623d7..5bd86624013 100644 --- a/apps/sim/lib/internal/box/operations.ts +++ b/apps/sim/lib/internal/box/operations.ts @@ -4,8 +4,8 @@ import { assertKnownSizeWithinLimit, isPayloadSizeLimitError } from '@/lib/core/ import { BoxClient, BoxUploadError } from '@/lib/internal/box/client' import type { BoxUploadFileInput } from '@/lib/internal/box/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/brex/operations.test.ts b/apps/sim/lib/internal/brex/operations.test.ts index b4fb1cc0b64..cb1876ce058 100644 --- a/apps/sim/lib/internal/brex/operations.test.ts +++ b/apps/sim/lib/internal/brex/operations.test.ts @@ -35,9 +35,9 @@ vi.mock('@/lib/internal/brex/client', () => { return { BrexReceiptClient, BrexReceiptError } }) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/lib/internal/brex/operations.ts b/apps/sim/lib/internal/brex/operations.ts index 637f3a2700d..ec05f1ff770 100644 --- a/apps/sim/lib/internal/brex/operations.ts +++ b/apps/sim/lib/internal/brex/operations.ts @@ -3,8 +3,8 @@ import { getErrorMessage } from '@sim/utils/errors' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { BrexReceiptClient, BrexReceiptError } from '@/lib/internal/brex/client' import type { BrexMatchReceiptInput, BrexUploadReceiptInput } from '@/lib/internal/brex/schema' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/buffer/operations.test.ts b/apps/sim/lib/internal/buffer/operations.test.ts index d2440cbff78..22cf5ca9d1f 100644 --- a/apps/sim/lib/internal/buffer/operations.test.ts +++ b/apps/sim/lib/internal/buffer/operations.test.ts @@ -4,7 +4,7 @@ import { } from '@sim/testing/mocks/file-utils-server.mock' import { describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockResolveFileInputToUrl } = fileUtilsServerMockFns diff --git a/apps/sim/lib/internal/buffer/operations.ts b/apps/sim/lib/internal/buffer/operations.ts index 99787c1afff..f4324b5bee4 100644 --- a/apps/sim/lib/internal/buffer/operations.ts +++ b/apps/sim/lib/internal/buffer/operations.ts @@ -8,8 +8,8 @@ import { } from '@/lib/core/security/input-validation.server' import { BufferOperationError } from '@/lib/internal/buffer/errors' import type { BufferCreatePostInput, BufferEditPostInput } from '@/lib/internal/buffer/input' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' import { parseBufferInput } from '@/tools/buffer/schema' import { BUFFER_API_URL, diff --git a/apps/sim/lib/internal/clickup/operations.test.ts b/apps/sim/lib/internal/clickup/operations.test.ts index a3639c9c4e7..02cc13f2e18 100644 --- a/apps/sim/lib/internal/clickup/operations.test.ts +++ b/apps/sim/lib/internal/clickup/operations.test.ts @@ -14,8 +14,8 @@ const mocks = vi.hoisted(() => ({ })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/internal/clickup/client', () => ({ uploadClickUpAttachment: mocks.uploadClickUpAttachment, })) diff --git a/apps/sim/lib/internal/clickup/operations.ts b/apps/sim/lib/internal/clickup/operations.ts index 2d96af66413..6d69f191880 100644 --- a/apps/sim/lib/internal/clickup/operations.ts +++ b/apps/sim/lib/internal/clickup/operations.ts @@ -5,9 +5,9 @@ import { uploadClickUpAttachment } from '@/lib/internal/clickup/client' import { ClickUpOperationError } from '@/lib/internal/clickup/errors' import type { ClickUpUploadAttachmentInput } from '@/lib/internal/clickup/schema' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { parseRawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import { mapClickUpAttachment } from '@/tools/clickup/shared' diff --git a/apps/sim/lib/internal/confluence/operations.test.ts b/apps/sim/lib/internal/confluence/operations.test.ts index 76285588739..a867c8f84e8 100644 --- a/apps/sim/lib/internal/confluence/operations.test.ts +++ b/apps/sim/lib/internal/confluence/operations.test.ts @@ -11,9 +11,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns const { mockProcessSingleFileToUserFile } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/confluence/operations.ts b/apps/sim/lib/internal/confluence/operations.ts index 2faa2a9c034..14f75ba33d7 100644 --- a/apps/sim/lib/internal/confluence/operations.ts +++ b/apps/sim/lib/internal/confluence/operations.ts @@ -63,8 +63,8 @@ import { import { ConfluenceOperationError } from '@/lib/internal/confluence/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processSingleFileToUserFile, type RawFileInput } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processSingleFileToUserFile, type RawFileInput } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import { cleanHtmlContent } from '@/tools/confluence/utils' import { parseAtlassianErrorMessage } from '@/tools/jira/utils' diff --git a/apps/sim/lib/internal/daytona/operations.ts b/apps/sim/lib/internal/daytona/operations.ts index 8682b958374..9338689c3a0 100644 --- a/apps/sim/lib/internal/daytona/operations.ts +++ b/apps/sim/lib/internal/daytona/operations.ts @@ -3,9 +3,9 @@ import { getErrorMessage } from '@sim/utils/errors' import { isPayloadSizeLimitError, readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' import { DaytonaOperationError } from '@/lib/internal/daytona/errors' import { isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { DaytonaUploadFileParams, DaytonaUploadFileResponse } from '@/tools/daytona/types' import { daytonaToolboxUrl } from '@/tools/daytona/utils' diff --git a/apps/sim/lib/internal/discord/operations.test.ts b/apps/sim/lib/internal/discord/operations.test.ts index ddfc7e3c9f2..9c08852a2d1 100644 --- a/apps/sim/lib/internal/discord/operations.test.ts +++ b/apps/sim/lib/internal/discord/operations.test.ts @@ -13,9 +13,9 @@ vi.mock('@/lib/internal/discord/client', () => ({ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { executeDiscordSendMessage } from '@/lib/internal/discord/operations' diff --git a/apps/sim/lib/internal/discord/operations.ts b/apps/sim/lib/internal/discord/operations.ts index a4571e27c66..cfb7a775ab4 100644 --- a/apps/sim/lib/internal/discord/operations.ts +++ b/apps/sim/lib/internal/discord/operations.ts @@ -9,8 +9,8 @@ import type { DiscordSendMessageInput } from '@/lib/internal/discord/schema' import { createInternalToolFilesResult } from '@/lib/internal/tool-operations/file-result' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('DiscordOperations') diff --git a/apps/sim/lib/internal/docusign/operations.test.ts b/apps/sim/lib/internal/docusign/operations.test.ts index c0815cdb62e..f5e002e32f5 100644 --- a/apps/sim/lib/internal/docusign/operations.test.ts +++ b/apps/sim/lib/internal/docusign/operations.test.ts @@ -28,8 +28,8 @@ vi.mock('@/lib/internal/docusign/client', () => ({ }, })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/lib/uploads/utils/file-schemas', () => ({ FileInputSchema: { parse: mocks.fileParse }, })) diff --git a/apps/sim/lib/internal/docusign/operations.ts b/apps/sim/lib/internal/docusign/operations.ts index 5098ce81b30..156a92bbf86 100644 --- a/apps/sim/lib/internal/docusign/operations.ts +++ b/apps/sim/lib/internal/docusign/operations.ts @@ -6,9 +6,9 @@ import { DocuSignOperationError } from '@/lib/internal/docusign/errors' import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot' import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { FileInputSchema } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { DocuSignCreateFromTemplateParams, diff --git a/apps/sim/lib/internal/dropbox/operations.test.ts b/apps/sim/lib/internal/dropbox/operations.test.ts index fc77f3eeee8..d1e0847f134 100644 --- a/apps/sim/lib/internal/dropbox/operations.test.ts +++ b/apps/sim/lib/internal/dropbox/operations.test.ts @@ -32,8 +32,8 @@ vi.mock('@/lib/internal/dropbox/client', () => { } return { DropboxClient, DropboxUploadError } }) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) const { mockProcessFilesToUserFiles } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/dropbox/operations.ts b/apps/sim/lib/internal/dropbox/operations.ts index c97286bb51b..1c1d372b60e 100644 --- a/apps/sim/lib/internal/dropbox/operations.ts +++ b/apps/sim/lib/internal/dropbox/operations.ts @@ -4,8 +4,8 @@ import { assertKnownSizeWithinLimit, isPayloadSizeLimitError } from '@/lib/core/ import { DropboxClient, DropboxUploadError } from '@/lib/internal/dropbox/client' import type { DropboxUploadInput } from '@/lib/internal/dropbox/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/elevenlabs/operations.test.ts b/apps/sim/lib/internal/elevenlabs/operations.test.ts index a78f4ba52c3..909504c5832 100644 --- a/apps/sim/lib/internal/elevenlabs/operations.test.ts +++ b/apps/sim/lib/internal/elevenlabs/operations.test.ts @@ -32,9 +32,9 @@ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) vi.mock('@/lib/internal/elevenlabs/client', () => ({ generateElevenLabsAudio: mocks.generateElevenLabsAudio, })) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/uploads', () => uploadsMock) diff --git a/apps/sim/lib/internal/elevenlabs/operations.ts b/apps/sim/lib/internal/elevenlabs/operations.ts index a059270a493..29d162f079b 100644 --- a/apps/sim/lib/internal/elevenlabs/operations.ts +++ b/apps/sim/lib/internal/elevenlabs/operations.ts @@ -17,10 +17,10 @@ import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' -import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { getMimeTypeFromExtension } from '@/lib/uploads/utils/file' +import { downloadFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/extend/operations.ts b/apps/sim/lib/internal/extend/operations.ts index 0532c4634f1..c170702dd2c 100644 --- a/apps/sim/lib/internal/extend/operations.ts +++ b/apps/sim/lib/internal/extend/operations.ts @@ -3,7 +3,7 @@ import { validateOpaqueModelInputProvenance } from '@/lib/execution/model-input- import { submitExtendParse } from '@/lib/internal/extend/client' import { ExtendOperationError } from '@/lib/internal/extend/errors' import type { ExtendParseInput } from '@/lib/internal/extend/input' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' const logger = createLogger('ExtendOperations') diff --git a/apps/sim/lib/internal/file/execute-tool.test.ts b/apps/sim/lib/internal/file/execute-tool.test.ts index e7cb47ce105..0aa42882fc0 100644 --- a/apps/sim/lib/internal/file/execute-tool.test.ts +++ b/apps/sim/lib/internal/file/execute-tool.test.ts @@ -6,7 +6,7 @@ import { } from '@sim/testing/mocks/executor-principal.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' import { InvalidInternalDelegationBindingError } from '@/lib/auth/internal-delegation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' const mocks = vi.hoisted(() => ({ executeManage: vi.fn(), diff --git a/apps/sim/lib/internal/file/materialization-context.ts b/apps/sim/lib/internal/file/materialization-context.ts index 8c19a647522..1589b24fedd 100644 --- a/apps/sim/lib/internal/file/materialization-context.ts +++ b/apps/sim/lib/internal/file/materialization-context.ts @@ -1,6 +1,6 @@ import type { ExecutionMaterializationContext } from '@/lib/execution/payloads/materialization.server' import { createExecutorPrincipalFromExecutionContext } from '@/lib/internal/principals/executor' -import { tryInferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { tryInferContextFromKey } from '@/lib/uploads/utils/file' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' import type { ExecutionContext, UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/file/operations.provenance.test.ts b/apps/sim/lib/internal/file/operations.provenance.test.ts index fda49a84a38..0058046893d 100644 --- a/apps/sim/lib/internal/file/operations.provenance.test.ts +++ b/apps/sim/lib/internal/file/operations.provenance.test.ts @@ -37,15 +37,15 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ +vi.mock('@/lib/workspace-files/application/folders', () => ({ ensureWorkspaceFileFolderPathOperation: { execute: vi.fn(), }, @@ -82,7 +82,7 @@ vi.mock('@/lib/workspace-files/application/move-workspace-file-items', () => ({ vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) @@ -127,7 +127,7 @@ import { isOpaqueWorkspaceFileEgressSafe, replaceWorkspaceFileSecretProvenanceInTx, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { createWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import { projectResolvedSecretModelContent } from '@/executor/utils/resolved-secret-content-projection' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/internal/file/operations.test.ts b/apps/sim/lib/internal/file/operations.test.ts index 13d41897ff5..aa228f2efb1 100644 --- a/apps/sim/lib/internal/file/operations.test.ts +++ b/apps/sim/lib/internal/file/operations.test.ts @@ -78,15 +78,15 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ +vi.mock('@/lib/workspace-files/application/folders', () => ({ ensureWorkspaceFileFolderPathOperation: { execute: (...args: unknown[]) => mockEnsureWorkspaceFileFolderPath(...args), }, @@ -122,13 +122,13 @@ vi.mock('@/lib/workspace-files/application/move-workspace-file-items', () => ({ })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) diff --git a/apps/sim/lib/internal/file/operations.ts b/apps/sim/lib/internal/file/operations.ts index e45dbd26d19..aacdd31bc1f 100644 --- a/apps/sim/lib/internal/file/operations.ts +++ b/apps/sim/lib/internal/file/operations.ts @@ -33,7 +33,7 @@ import { buildFolderPath, parseFolderPath, ROOT_FOLDER_PATH } from '@/lib/folder import type { FolderIdScope } from '@/lib/folders/scope' import { collectFolderDepths } from '@/lib/folders/subtree' import { splitWorkspaceFilePath } from '@/lib/mothership/tools/server/files/workspace-file' -import { ShareValidationError } from '@/lib/public-shares/share-manager' +import { ShareValidationError } from '@/lib/public-shares/manager' import { ArchiveError, type DecompressResult, @@ -41,29 +41,29 @@ import { MAX_ARCHIVE_BYTES, statusForArchiveError, } from '@/lib/uploads/archive' -import { normalizeWorkspaceFileItemName } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { normalizeWorkspaceFileItemName } from '@/lib/uploads/contexts/workspace/file-folder-manager' import type { getWorkspaceFile, getWorkspaceFileWithCurrentVersion, WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { getWorkspaceFileVersionsByKey } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { getWorkspaceFileVersionsByKey } from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenance, mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { INITIAL_WORKSPACE_FILE_VERSION } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { INITIAL_WORKSPACE_FILE_VERSION } from '@/lib/uploads/contexts/workspace/file-version-store' import { getFileExtension, getMimeTypeFromExtension, tryInferContextFromKey, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { downloadFileFromStorage, downloadServableFileFromStorage, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { buildZipEntryPaths } from '@/lib/uploads/zip-entry-path' import { @@ -73,6 +73,14 @@ import { } from '@/lib/workspace-files/application/create-workspace-file' import { editWorkspaceFileContent } from '@/lib/workspace-files/application/edit-workspace-file-content' import { workspaceFileRevisionField } from '@/lib/workspace-files/application/file-revision' +import { + createWorkspaceFileFolderOperation, + deleteWorkspaceFileFolderOperation, + ensureWorkspaceFileFolderPathOperation, + listWorkspaceFileFoldersOperation, + restoreWorkspaceFileFolderOperation, + updateWorkspaceFileFolderOperation, +} from '@/lib/workspace-files/application/folders' import { listWorkspaceFilesInFolderScope, queryWorkspaceFilePage, @@ -92,14 +100,6 @@ import { updateWorkspaceFileShare, } from '@/lib/workspace-files/application/share-workspace-file' import { updateWorkspaceFileContent } from '@/lib/workspace-files/application/update-workspace-file-content' -import { - createWorkspaceFileFolderOperation, - deleteWorkspaceFileFolderOperation, - ensureWorkspaceFileFolderPathOperation, - listWorkspaceFileFoldersOperation, - restoreWorkspaceFileFolderOperation, - updateWorkspaceFileFolderOperation, -} from '@/lib/workspace-files/application/workspace-file-folders' import { selectDirectoryEntries } from '@/lib/workspace-files/directory-listing' import type { WorkspaceFileContentEdit } from '@/lib/workspace-files/edit-content' import { toWorkspaceFileFolderPathView } from '@/lib/workspace-files/folder-display-path' diff --git a/apps/sim/lib/internal/file/parser.test.ts b/apps/sim/lib/internal/file/parser.test.ts index 5f52dcaac5b..820b52fa3ee 100644 --- a/apps/sim/lib/internal/file/parser.test.ts +++ b/apps/sim/lib/internal/file/parser.test.ts @@ -87,7 +87,7 @@ vi.mock('@/lib/execution/payloads/file-secret-provenance', () => ({ })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) @@ -153,7 +153,7 @@ vi.mock('@/lib/core/utils/logging', () => ({ vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) diff --git a/apps/sim/lib/internal/file/parser.ts b/apps/sim/lib/internal/file/parser.ts index 6a8ff461961..d1d1f7dcfeb 100644 --- a/apps/sim/lib/internal/file/parser.ts +++ b/apps/sim/lib/internal/file/parser.ts @@ -38,7 +38,7 @@ import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' import { getBoundWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { UPLOAD_DIR_SERVER } from '@/lib/uploads/core/setup.server' import { isWorkspaceScopedContext } from '@/lib/uploads/shared/types' import { @@ -53,7 +53,7 @@ import { getViewerUrl, inferContextFromKey, isInternalFileUrl, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { readWorkspaceFileNameByKey } from '@/lib/workspace-files/application/read-workspace-file-name-by-key' import type { UserFile } from '@/executor/types' import '@/lib/uploads/core/setup.server' diff --git a/apps/sim/lib/internal/firecrawl/operations.test.ts b/apps/sim/lib/internal/firecrawl/operations.test.ts index 3f274ecc0ee..aca3d12c46f 100644 --- a/apps/sim/lib/internal/firecrawl/operations.test.ts +++ b/apps/sim/lib/internal/firecrawl/operations.test.ts @@ -19,10 +19,10 @@ import { vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/internal/firecrawl/operations.ts b/apps/sim/lib/internal/firecrawl/operations.ts index 0a8c641fc93..55a8a21efe4 100644 --- a/apps/sim/lib/internal/firecrawl/operations.ts +++ b/apps/sim/lib/internal/firecrawl/operations.ts @@ -11,10 +11,10 @@ import type { FirecrawlParseInput } from '@/lib/internal/firecrawl/schema' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { hasFirecrawlParseModelInput } from '@/tools/firecrawl/model-input' diff --git a/apps/sim/lib/internal/fireflies/operations.test.ts b/apps/sim/lib/internal/fireflies/operations.test.ts index 16afb3b7156..b4d305fe1d1 100644 --- a/apps/sim/lib/internal/fireflies/operations.test.ts +++ b/apps/sim/lib/internal/fireflies/operations.test.ts @@ -9,7 +9,7 @@ import { RESOLVED_SECRET_PROVENANCE_METADATA_V1, } from '@/lib/execution/private-tool-metadata' -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockResolveFileInputToUrl } = fileUtilsServerMockFns diff --git a/apps/sim/lib/internal/fireflies/operations.ts b/apps/sim/lib/internal/fireflies/operations.ts index 10bbdc1e0fd..043a3c14a65 100644 --- a/apps/sim/lib/internal/fireflies/operations.ts +++ b/apps/sim/lib/internal/fireflies/operations.ts @@ -3,8 +3,8 @@ import { getErrorMessage } from '@sim/utils/errors' import { readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' import { validateOpaqueModelInputProvenance } from '@/lib/execution/model-input-provenance' import type { FirefliesUploadAudioInput } from '@/lib/internal/fireflies/schema' -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +import type { RawFileInput } from '@/lib/uploads/utils/file' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' const logger = createLogger('FirefliesUploadAudio') const FIREFLIES_API_URL = 'https://api.fireflies.ai/graphql' diff --git a/apps/sim/lib/internal/function/execute.ts b/apps/sim/lib/internal/function/execute.ts index 5383a810faa..81000f13976 100644 --- a/apps/sim/lib/internal/function/execute.ts +++ b/apps/sim/lib/internal/function/execute.ts @@ -2,7 +2,7 @@ import type { DelegatedPrincipal } from '@sim/auth/principal' import type { FunctionExecuteBody } from '@/lib/api/contracts' import type { InternalSandboxProfile } from '@/lib/auth/internal' import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/core/execution-limits' -import { serializeExecutionDeadlineHeader } from '@/lib/execution/execution-deadline-header' +import { serializeExecutionDeadlineHeader } from '@/lib/execution/deadline-header' import { FUNCTION_EXECUTION_DELEGATION_AUDIENCE } from '@/lib/function-execution/application/authorization' import { executeChatFunction } from '@/lib/function-execution/application/execute-chat-function' import { executeFunction } from '@/lib/function-execution/application/execute-function' diff --git a/apps/sim/lib/internal/gmail/mail.ts b/apps/sim/lib/internal/gmail/mail.ts index ac5c9407f42..323bcffe417 100644 --- a/apps/sim/lib/internal/gmail/mail.ts +++ b/apps/sim/lib/internal/gmail/mail.ts @@ -10,8 +10,8 @@ import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { GmailClient } from '@/lib/internal/gmail/client' import { GmailOperationError } from '@/lib/internal/gmail/errors' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import { base64UrlEncode, buildMimeMessage, buildSimpleEmailMessage } from '@/tools/gmail/utils' diff --git a/apps/sim/lib/internal/gmail/operations.test.ts b/apps/sim/lib/internal/gmail/operations.test.ts index 353909f8b44..f9a668115fe 100644 --- a/apps/sim/lib/internal/gmail/operations.test.ts +++ b/apps/sim/lib/internal/gmail/operations.test.ts @@ -11,9 +11,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns const { mockProcessFilesToUserFiles } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/google-drive/file-input.test.ts b/apps/sim/lib/internal/google-drive/file-input.test.ts index 44efffc0096..54302456d25 100644 --- a/apps/sim/lib/internal/google-drive/file-input.test.ts +++ b/apps/sim/lib/internal/google-drive/file-input.test.ts @@ -11,9 +11,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns const { mockProcessSingleFileToUserFile } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/google-drive/file-input.ts b/apps/sim/lib/internal/google-drive/file-input.ts index 1f383a943b3..73015e11965 100644 --- a/apps/sim/lib/internal/google-drive/file-input.ts +++ b/apps/sim/lib/internal/google-drive/file-input.ts @@ -3,9 +3,9 @@ import { getErrorMessage } from '@sim/utils/errors' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { GoogleDriveOperationError } from '@/lib/internal/google-drive/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/guardrails/operations.test.ts b/apps/sim/lib/internal/guardrails/operations.test.ts index 6d24b4807ec..1f59dd46016 100644 --- a/apps/sim/lib/internal/guardrails/operations.test.ts +++ b/apps/sim/lib/internal/guardrails/operations.test.ts @@ -27,7 +27,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/auth/credential-access', () => ({ authorizeCredentialUseForAuth: mocks.authorizeCredential, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) vi.mock('@/lib/billing/threshold-billing', () => ({ checkAndBillPayerOverageThreshold: vi.fn(), diff --git a/apps/sim/lib/internal/guardrails/operations.ts b/apps/sim/lib/internal/guardrails/operations.ts index 5deebc79f8d..64606b99e75 100644 --- a/apps/sim/lib/internal/guardrails/operations.ts +++ b/apps/sim/lib/internal/guardrails/operations.ts @@ -8,7 +8,7 @@ import { type BillingAttributionSnapshot, requireBillingAttributionHeader, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { inspectModelInputProvenanceRequest } from '@/lib/execution/model-input-provenance' diff --git a/apps/sim/lib/internal/instagram/execute-tool.test.ts b/apps/sim/lib/internal/instagram/execute-tool.test.ts index 4e660b36145..7c257bd356e 100644 --- a/apps/sim/lib/internal/instagram/execute-tool.test.ts +++ b/apps/sim/lib/internal/instagram/execute-tool.test.ts @@ -14,7 +14,7 @@ import { } from '@sim/testing/mocks/uploads-metadata.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) vi.mock('@/lib/uploads/contexts/copilot', () => uploadsCopilotMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) diff --git a/apps/sim/lib/internal/instagram/operations.ts b/apps/sim/lib/internal/instagram/operations.ts index faa36a63bf4..07e71152dad 100644 --- a/apps/sim/lib/internal/instagram/operations.ts +++ b/apps/sim/lib/internal/instagram/operations.ts @@ -29,8 +29,8 @@ import { getExtensionFromMimeType, getFileExtension, getMimeTypeFromExtension, -} from '@/lib/uploads/utils/file-utils' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { MAX_FILE_SIZE, sniffImageContentType } from '@/lib/uploads/utils/validation' import { sanitizeFileName } from '@/executor/constants' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/instagram/publishing.test.ts b/apps/sim/lib/internal/instagram/publishing.test.ts index 280e4dfcabb..bc02b370c8f 100644 --- a/apps/sim/lib/internal/instagram/publishing.test.ts +++ b/apps/sim/lib/internal/instagram/publishing.test.ts @@ -8,7 +8,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockHasCloudStorage } = storageServiceMockFns const { mockResolveFileInputToUrl } = fileUtilsServerMockFns diff --git a/apps/sim/lib/internal/instagram/publishing.ts b/apps/sim/lib/internal/instagram/publishing.ts index 82a55a04a8b..cb00babd95b 100644 --- a/apps/sim/lib/internal/instagram/publishing.ts +++ b/apps/sim/lib/internal/instagram/publishing.ts @@ -7,8 +7,8 @@ import { getMimeTypeFromExtension, type RawFileInput, resolveFileType, -} from '@/lib/uploads/utils/file-utils' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' import { bearerHeaders, graphUrl, diff --git a/apps/sim/lib/internal/jira/operations.test.ts b/apps/sim/lib/internal/jira/operations.test.ts index a52abcc4353..0dbaf326401 100644 --- a/apps/sim/lib/internal/jira/operations.test.ts +++ b/apps/sim/lib/internal/jira/operations.test.ts @@ -20,9 +20,9 @@ vi.mock('@/lib/internal/jira/client', () => ({ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns const { mockProcessFilesToUserFiles } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/jira/operations.ts b/apps/sim/lib/internal/jira/operations.ts index fcf3566f7b5..578562e80fe 100644 --- a/apps/sim/lib/internal/jira/operations.ts +++ b/apps/sim/lib/internal/jira/operations.ts @@ -10,8 +10,8 @@ import type { JiraWriteInput, } from '@/lib/internal/jira/input' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { parseAtlassianErrorMessage, toAdf } from '@/tools/jira/utils' diff --git a/apps/sim/lib/internal/jupyter/file-input.test.ts b/apps/sim/lib/internal/jupyter/file-input.test.ts index dee53442574..da26d73f582 100644 --- a/apps/sim/lib/internal/jupyter/file-input.test.ts +++ b/apps/sim/lib/internal/jupyter/file-input.test.ts @@ -18,8 +18,8 @@ const fileMocks = vi.hoisted(() => ({ vi.mock('@/lib/uploads/shared/types', () => ({ MAX_BUFFERED_TRANSFER_BYTES: 50 * 1024 * 1024, })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/utils/servable-file-response', () => ({ docNotReadyResponse: fileMocks.docNotReadyResponse, })) diff --git a/apps/sim/lib/internal/jupyter/file-input.ts b/apps/sim/lib/internal/jupyter/file-input.ts index 050a12e91bc..dced3fc664c 100644 --- a/apps/sim/lib/internal/jupyter/file-input.ts +++ b/apps/sim/lib/internal/jupyter/file-input.ts @@ -3,8 +3,8 @@ import { getErrorMessage } from '@sim/utils/errors' import type { JupyterUploadBody } from '@/lib/api/contracts/storage-transfer' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/jupyter/operations.ts b/apps/sim/lib/internal/jupyter/operations.ts index 3beeef70bb3..9fb6791e083 100644 --- a/apps/sim/lib/internal/jupyter/operations.ts +++ b/apps/sim/lib/internal/jupyter/operations.ts @@ -23,7 +23,7 @@ import { import { createInternalToolFileResult } from '@/lib/internal/tool-operations/file-result' import type { InternalToolOperationResult } from '@/lib/internal/tool-operations/types' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' const uploadLogger = createLogger('JupyterUploadAPI') diff --git a/apps/sim/lib/internal/knowledge/operations.test.ts b/apps/sim/lib/internal/knowledge/operations.test.ts index 56734c57eb3..ae8eb2a6646 100644 --- a/apps/sim/lib/internal/knowledge/operations.test.ts +++ b/apps/sim/lib/internal/knowledge/operations.test.ts @@ -12,7 +12,7 @@ const mocks = vi.hoisted(() => ({ connectorSynced: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/api/internal-route', () => ({ internalKnowledgeProvenanceUserId: (_headers: Headers, principal: { subjectUserId?: string }) => diff --git a/apps/sim/lib/internal/knowledge/operations.ts b/apps/sim/lib/internal/knowledge/operations.ts index 4eb0dbc681b..d2bdd25c6f4 100644 --- a/apps/sim/lib/internal/knowledge/operations.ts +++ b/apps/sim/lib/internal/knowledge/operations.ts @@ -11,7 +11,7 @@ import { } from '@/lib/api/contracts/knowledge' import type { KnowledgeSearchBody } from '@/lib/api/contracts/knowledge/search' import { AuthType } from '@/lib/auth/hybrid' -import { requireWorkspaceBillingAttributionHeader } from '@/lib/billing/core/billing-attribution' +import { requireWorkspaceBillingAttributionHeader } from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { internalKnowledgeAnalytics, diff --git a/apps/sim/lib/internal/knowledge/search.ts b/apps/sim/lib/internal/knowledge/search.ts index 7b0ab7dc16a..7739aee5af0 100644 --- a/apps/sim/lib/internal/knowledge/search.ts +++ b/apps/sim/lib/internal/knowledge/search.ts @@ -1,4 +1,4 @@ -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { createExecutorPrincipalFromExecutionContext } from '@/lib/internal/principals/executor' import type { InternalToolOperationContext } from '@/lib/internal/tool-operations/types' import { KNOWLEDGE_DELEGATION_AUDIENCE } from '@/lib/knowledge/application/authorization' diff --git a/apps/sim/lib/internal/linq/operations.ts b/apps/sim/lib/internal/linq/operations.ts index 7344fbb92b3..5a6d3e91a4d 100644 --- a/apps/sim/lib/internal/linq/operations.ts +++ b/apps/sim/lib/internal/linq/operations.ts @@ -9,11 +9,11 @@ import type { LinqCreateAttachmentInput } from '@/lib/internal/linq/schema' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('LinqOperations') diff --git a/apps/sim/lib/internal/llm/operations.test.ts b/apps/sim/lib/internal/llm/operations.test.ts index 3903934951d..d6c76e75ccd 100644 --- a/apps/sim/lib/internal/llm/operations.test.ts +++ b/apps/sim/lib/internal/llm/operations.test.ts @@ -22,7 +22,7 @@ vi.mock('@/providers', () => providersMock) vi.mock('@/lib/auth/credential-access', () => ({ authorizeCredentialUseForAuth: mocks.authorizeCredential, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/environment-context', () => mothershipEnvironmentContextMock) vi.mock('@/lib/internal/llm/credentials', () => ({ resolveVertexAccessToken: mocks.resolveVertexAccessToken, diff --git a/apps/sim/lib/internal/llm/operations.ts b/apps/sim/lib/internal/llm/operations.ts index e8274a7fefd..c0ee22c836a 100644 --- a/apps/sim/lib/internal/llm/operations.ts +++ b/apps/sim/lib/internal/llm/operations.ts @@ -7,7 +7,7 @@ import { BILLING_ATTRIBUTION_HEADER, type BillingAttributionSnapshot, requireBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { inspectModelInputProjectionState, inspectModelInputProvenanceRequest, diff --git a/apps/sim/lib/internal/mail/attachment-materialization.test.ts b/apps/sim/lib/internal/mail/attachment-materialization.test.ts index b4d34490ef2..de9e1ee09dc 100644 --- a/apps/sim/lib/internal/mail/attachment-materialization.test.ts +++ b/apps/sim/lib/internal/mail/attachment-materialization.test.ts @@ -10,8 +10,8 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) const { mockAssertToolFileAccess } = filesAuthorizationMockFns const { mockProcessFilesToUserFiles } = fileUtilsMockFns diff --git a/apps/sim/lib/internal/mail/attachment-materialization.ts b/apps/sim/lib/internal/mail/attachment-materialization.ts index 563495c2107..48ba6dcfd56 100644 --- a/apps/sim/lib/internal/mail/attachment-materialization.ts +++ b/apps/sim/lib/internal/mail/attachment-materialization.ts @@ -3,9 +3,9 @@ import { getErrorMessage } from '@sim/utils/errors' import { isRecordLike } from '@sim/utils/object' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('MailAttachmentMaterialization') diff --git a/apps/sim/lib/internal/mcp/execute-tool.test.ts b/apps/sim/lib/internal/mcp/execute-tool.test.ts index 7c29b617eb0..0265e2243d6 100644 --- a/apps/sim/lib/internal/mcp/execute-tool.test.ts +++ b/apps/sim/lib/internal/mcp/execute-tool.test.ts @@ -11,7 +11,7 @@ import { executorPrincipalMockFns, } from '@sim/testing/mocks/executor-principal.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { listMcpOperations } from '@/lib/internal/mcp/list-operations' import type { InternalToolOperationContext } from '@/lib/internal/tool-operations/types' import { McpBlock } from '@/blocks/blocks/mcp' diff --git a/apps/sim/lib/internal/memory/operations.test.ts b/apps/sim/lib/internal/memory/operations.test.ts index eb9b8cfbcdf..088928b1dbf 100644 --- a/apps/sim/lib/internal/memory/operations.test.ts +++ b/apps/sim/lib/internal/memory/operations.test.ts @@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => ({ readWriteProvenance: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/memory/application/use-cases', () => ({ appendMemoryUseCase: { execute: mocks.append }, diff --git a/apps/sim/lib/internal/memory/operations.ts b/apps/sim/lib/internal/memory/operations.ts index 29103641ced..5bc74c8fe27 100644 --- a/apps/sim/lib/internal/memory/operations.ts +++ b/apps/sim/lib/internal/memory/operations.ts @@ -5,7 +5,7 @@ import type { deleteMemoryByQueryContract, listMemoriesContract, } from '@/lib/api/contracts/memory' -import { requireWorkspaceBillingAttributionHeader } from '@/lib/billing/core/billing-attribution' +import { requireWorkspaceBillingAttributionHeader } from '@/lib/billing/core/attribution' import { memoryToolRequestsProvenance, memoryToolSuppliesWriteProvenance, diff --git a/apps/sim/lib/internal/microsoft-dataverse/operations.ts b/apps/sim/lib/internal/microsoft-dataverse/operations.ts index 63664c67d76..0a6fdb52740 100644 --- a/apps/sim/lib/internal/microsoft-dataverse/operations.ts +++ b/apps/sim/lib/internal/microsoft-dataverse/operations.ts @@ -6,8 +6,8 @@ import { uploadDataverseFile } from '@/lib/internal/microsoft-dataverse/client' import { DataverseOperationError } from '@/lib/internal/microsoft-dataverse/errors' import type { DataverseUploadFileInput } from '@/lib/internal/microsoft-dataverse/schema' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import { getDataverseBaseUrl } from '@/tools/microsoft_dataverse/utils' diff --git a/apps/sim/lib/internal/microsoft-teams/operations.ts b/apps/sim/lib/internal/microsoft-teams/operations.ts index f6829cd2098..99a77afb00c 100644 --- a/apps/sim/lib/internal/microsoft-teams/operations.ts +++ b/apps/sim/lib/internal/microsoft-teams/operations.ts @@ -17,8 +17,8 @@ import { } from '@/lib/internal/tool-operations/file-result' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/mistral/operations.test.ts b/apps/sim/lib/internal/mistral/operations.test.ts index 5949e50ae11..d9271893695 100644 --- a/apps/sim/lib/internal/mistral/operations.test.ts +++ b/apps/sim/lib/internal/mistral/operations.test.ts @@ -25,9 +25,9 @@ vi.mock('@/lib/internal/mistral/client', () => ({ submitMistralOcr: submit })) vi.mock('@/lib/internal/mistral/page-count', () => ({ countMistralPdfPages: countPages })) vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/internal/mistral/operations.ts b/apps/sim/lib/internal/mistral/operations.ts index eb9c9b14cf4..6f25359adeb 100644 --- a/apps/sim/lib/internal/mistral/operations.ts +++ b/apps/sim/lib/internal/mistral/operations.ts @@ -13,18 +13,18 @@ import { MISTRAL_OCR_REQUEST_POLICY } from '@/lib/knowledge/documents/ocr-reques import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { extractStorageKey, isInternalFileUrl, processSingleFileToUserFile, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { downloadFileFromUrl, downloadServableFileFromStorage, resolveInternalFileUrl, type ServableFile, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('MistralOperations') diff --git a/apps/sim/lib/internal/onedrive/operations.test.ts b/apps/sim/lib/internal/onedrive/operations.test.ts index 45f0d1f4ab0..868b92680b0 100644 --- a/apps/sim/lib/internal/onedrive/operations.test.ts +++ b/apps/sim/lib/internal/onedrive/operations.test.ts @@ -26,9 +26,9 @@ vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { downloadOneDriveFile } from '@/lib/internal/onedrive/operations' diff --git a/apps/sim/lib/internal/onedrive/operations.ts b/apps/sim/lib/internal/onedrive/operations.ts index 10075e3b9a9..087bdc129a5 100644 --- a/apps/sim/lib/internal/onedrive/operations.ts +++ b/apps/sim/lib/internal/onedrive/operations.ts @@ -22,11 +22,8 @@ import { type InternalToolFileResult, } from '@/lib/internal/tool-operations/file-result' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { - getExtensionFromMimeType, - processSingleFileToUserFile, -} from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { getExtensionFromMimeType, processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { OneDriveToolParams } from '@/tools/onedrive/types' diff --git a/apps/sim/lib/internal/oracle-epm/files.server.ts b/apps/sim/lib/internal/oracle-epm/files.server.ts index 51a8df7bb61..43dfe1cee20 100644 --- a/apps/sim/lib/internal/oracle-epm/files.server.ts +++ b/apps/sim/lib/internal/oracle-epm/files.server.ts @@ -18,7 +18,7 @@ import { MAX_WORKSPACE_FILE_SIZE, MAX_WORKSPACE_FORMDATA_FILE_SIZE, } from '@/lib/uploads/shared/types' -import { resolveTrustedFileContext } from '@/lib/uploads/utils/file-utils' +import { resolveTrustedFileContext } from '@/lib/uploads/utils/file' import { isUuid, sanitizeFileName } from '@/executor/constants' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/outlook/operations.test.ts b/apps/sim/lib/internal/outlook/operations.test.ts index c5551e33fb5..a2fb269f504 100644 --- a/apps/sim/lib/internal/outlook/operations.test.ts +++ b/apps/sim/lib/internal/outlook/operations.test.ts @@ -34,8 +34,8 @@ vi.mock('@/lib/internal/outlook/client', () => ({ }, })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { OutlookOperationError } from '@/lib/internal/outlook/errors' import { executeOutlookGetAttachment, executeOutlookSend } from '@/lib/internal/outlook/operations' diff --git a/apps/sim/lib/internal/outlook/operations.ts b/apps/sim/lib/internal/outlook/operations.ts index 972e1c4cb33..9dcf9bc3c2f 100644 --- a/apps/sim/lib/internal/outlook/operations.ts +++ b/apps/sim/lib/internal/outlook/operations.ts @@ -16,8 +16,8 @@ import type { OutlookGetAttachmentInput } from '@/lib/internal/outlook/get-attac import { createInternalToolFileResult } from '@/lib/internal/tool-operations/file-result' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFilesWithinBudget } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { CleanedOutlookAttachmentMetadata } from '@/tools/outlook/types' diff --git a/apps/sim/lib/internal/persona/operations.test.ts b/apps/sim/lib/internal/persona/operations.test.ts index 921e7695bfb..cd71d1104f3 100644 --- a/apps/sim/lib/internal/persona/operations.test.ts +++ b/apps/sim/lib/internal/persona/operations.test.ts @@ -14,7 +14,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { importPersonaAccounts } from '@/lib/internal/persona/operations' diff --git a/apps/sim/lib/internal/persona/operations.ts b/apps/sim/lib/internal/persona/operations.ts index 3d8ec065e74..b29d19ef1da 100644 --- a/apps/sim/lib/internal/persona/operations.ts +++ b/apps/sim/lib/internal/persona/operations.ts @@ -2,9 +2,9 @@ import { createLogger } from '@sim/logger' import { readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' import { PersonaOperationError } from '@/lib/internal/persona/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { PersonaImportAccountsResponse } from '@/tools/persona/types' import { diff --git a/apps/sim/lib/internal/pipedrive/operations.ts b/apps/sim/lib/internal/pipedrive/operations.ts index e5fc60374dd..ae163e35b8e 100644 --- a/apps/sim/lib/internal/pipedrive/operations.ts +++ b/apps/sim/lib/internal/pipedrive/operations.ts @@ -6,7 +6,7 @@ import { type InternalToolFile, } from '@/lib/internal/tool-operations/file-result' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' const logger = createLogger('PipedriveOperations') diff --git a/apps/sim/lib/internal/pulse/operations.ts b/apps/sim/lib/internal/pulse/operations.ts index 4f8c4520692..988c6e9d18c 100644 --- a/apps/sim/lib/internal/pulse/operations.ts +++ b/apps/sim/lib/internal/pulse/operations.ts @@ -3,7 +3,7 @@ import { validateOpaqueModelInputProvenance } from '@/lib/execution/model-input- import { submitPulseParse } from '@/lib/internal/pulse/client' import { PulseOperationError } from '@/lib/internal/pulse/errors' import type { PulseParseInput } from '@/lib/internal/pulse/input' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' const logger = createLogger('PulseOperations') diff --git a/apps/sim/lib/internal/quickbooks/operations.ts b/apps/sim/lib/internal/quickbooks/operations.ts index 15410507abb..2629edf413c 100644 --- a/apps/sim/lib/internal/quickbooks/operations.ts +++ b/apps/sim/lib/internal/quickbooks/operations.ts @@ -13,8 +13,8 @@ import { } from '@/lib/core/utils/stream-limits' import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot' import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { buildQuickBooksCompanyUrl, buildQuickBooksHeaders } from '@/tools/quickbooks/client' diff --git a/apps/sim/lib/internal/quiver/operations.test.ts b/apps/sim/lib/internal/quiver/operations.test.ts index 3064ed62f43..8f008bbd16b 100644 --- a/apps/sim/lib/internal/quiver/operations.test.ts +++ b/apps/sim/lib/internal/quiver/operations.test.ts @@ -25,10 +25,10 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/internal/quiver/client', () => ({ requestQuiverSvg: mocks.requestQuiverSvg })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/internal/quiver/operations.ts b/apps/sim/lib/internal/quiver/operations.ts index 82f2ee79d60..c2a86cd74f0 100644 --- a/apps/sim/lib/internal/quiver/operations.ts +++ b/apps/sim/lib/internal/quiver/operations.ts @@ -11,11 +11,11 @@ import { import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { QuiverSvgResponse } from '@/tools/quiver/types' diff --git a/apps/sim/lib/internal/reducto/operations.ts b/apps/sim/lib/internal/reducto/operations.ts index c246fbfcb75..7de8b95e80a 100644 --- a/apps/sim/lib/internal/reducto/operations.ts +++ b/apps/sim/lib/internal/reducto/operations.ts @@ -3,7 +3,7 @@ import { validateOpaqueModelInputProvenance } from '@/lib/execution/model-input- import { submitReductoParse } from '@/lib/internal/reducto/client' import { ReductoOperationError } from '@/lib/internal/reducto/errors' import type { ReductoParseInput } from '@/lib/internal/reducto/input' -import { resolveFileInputToUrl } from '@/lib/uploads/utils/file-utils.server' +import { resolveFileInputToUrl } from '@/lib/uploads/utils/file.server' const logger = createLogger('ReductoOperations') diff --git a/apps/sim/lib/internal/s3/operations.test.ts b/apps/sim/lib/internal/s3/operations.test.ts index 3af4e7bd377..c5e1b443f1b 100644 --- a/apps/sim/lib/internal/s3/operations.test.ts +++ b/apps/sim/lib/internal/s3/operations.test.ts @@ -23,8 +23,8 @@ vi.mock('@aws-sdk/s3-request-presigner', () => ({ getSignedUrl: mocks.getSignedUrl, })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { S3OperationError } from '@/lib/internal/s3/errors' import { executeS3PutObject } from '@/lib/internal/s3/operations' diff --git a/apps/sim/lib/internal/s3/operations.ts b/apps/sim/lib/internal/s3/operations.ts index dface170c3c..948b89d2435 100644 --- a/apps/sim/lib/internal/s3/operations.ts +++ b/apps/sim/lib/internal/s3/operations.ts @@ -32,8 +32,8 @@ import { createS3Client, type S3ConnectionConfig } from '@/lib/internal/s3/clien import { S3OperationError } from '@/lib/internal/s3/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('S3Operations') diff --git a/apps/sim/lib/internal/sailpoint/execute-tool.test.ts b/apps/sim/lib/internal/sailpoint/execute-tool.test.ts index 0f8e31c2568..229091f672e 100644 --- a/apps/sim/lib/internal/sailpoint/execute-tool.test.ts +++ b/apps/sim/lib/internal/sailpoint/execute-tool.test.ts @@ -11,8 +11,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { PayloadSizeLimitError } from '@/lib/core/utils/stream-limits' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { executeSailPointTool } from '@/lib/internal/sailpoint/execute-tool' import { MAX_SAILPOINT_CSV_BYTES } from '@/lib/internal/sailpoint/operations' diff --git a/apps/sim/lib/internal/sailpoint/operations.ts b/apps/sim/lib/internal/sailpoint/operations.ts index b52e567338b..21b8b677201 100644 --- a/apps/sim/lib/internal/sailpoint/operations.ts +++ b/apps/sim/lib/internal/sailpoint/operations.ts @@ -11,9 +11,9 @@ import { sailpointFetch, } from '@/lib/internal/sailpoint/client' import type { SailPointInput } from '@/lib/internal/sailpoint/schema' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { parseRawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { safeUrlPathSegment } from '@/tools/url-path' diff --git a/apps/sim/lib/internal/sap-concur/operations.test.ts b/apps/sim/lib/internal/sap-concur/operations.test.ts index 0855eb0bf6b..10d8fc4a95e 100644 --- a/apps/sim/lib/internal/sap-concur/operations.test.ts +++ b/apps/sim/lib/internal/sap-concur/operations.test.ts @@ -26,9 +26,9 @@ vi.mock('@/lib/internal/sap-concur/client', () => ({ invokeSapConcurMultipart: mockInvokeMultipart, })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/utils/servable-file-response', () => ({ docNotReadyResponse: () => null, diff --git a/apps/sim/lib/internal/sap-concur/operations.ts b/apps/sim/lib/internal/sap-concur/operations.ts index 51d5c9612cb..017ea428da1 100644 --- a/apps/sim/lib/internal/sap-concur/operations.ts +++ b/apps/sim/lib/internal/sap-concur/operations.ts @@ -15,9 +15,9 @@ import { type SapConcurInvocation, } from '@/lib/internal/sap-concur/client' import type { SapConcurApiInput, SapConcurUploadInput } from '@/lib/internal/sap-concur/schema' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/servicenow/operations.ts b/apps/sim/lib/internal/servicenow/operations.ts index 98bd57c83f8..455ea2493e9 100644 --- a/apps/sim/lib/internal/servicenow/operations.ts +++ b/apps/sim/lib/internal/servicenow/operations.ts @@ -7,8 +7,8 @@ import { ServiceNowOperationError } from '@/lib/internal/servicenow/errors' import type { ServiceNowUploadAttachmentInput } from '@/lib/internal/servicenow/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('ServiceNowOperations') diff --git a/apps/sim/lib/internal/sftp/operations.test.ts b/apps/sim/lib/internal/sftp/operations.test.ts index 0b5aaa201e4..6b3b0008032 100644 --- a/apps/sim/lib/internal/sftp/operations.test.ts +++ b/apps/sim/lib/internal/sftp/operations.test.ts @@ -35,9 +35,9 @@ vi.mock('@/lib/internal/sftp/client', () => ({ sftpIsDirectory: mocks.isDirectory, })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/utils/servable-file-response', () => ({ docNotReadyResponse: mocks.docNotReadyResponse, diff --git a/apps/sim/lib/internal/sftp/operations.ts b/apps/sim/lib/internal/sftp/operations.ts index 9949f73f755..64c5e5983e8 100644 --- a/apps/sim/lib/internal/sftp/operations.ts +++ b/apps/sim/lib/internal/sftp/operations.ts @@ -29,8 +29,8 @@ import { getFileExtension, getMimeTypeFromExtension, processFilesToUserFiles, -} from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/sharepoint/operations.test.ts b/apps/sim/lib/internal/sharepoint/operations.test.ts index d804deadffb..2fffa15f38d 100644 --- a/apps/sim/lib/internal/sharepoint/operations.test.ts +++ b/apps/sim/lib/internal/sharepoint/operations.test.ts @@ -41,9 +41,9 @@ vi.mock('@/lib/internal/sharepoint/client', () => { return { SharePointClient, SharePointGraphError } }) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/lib/internal/sharepoint/operations.ts b/apps/sim/lib/internal/sharepoint/operations.ts index 3782a8d689b..91bc33648f2 100644 --- a/apps/sim/lib/internal/sharepoint/operations.ts +++ b/apps/sim/lib/internal/sharepoint/operations.ts @@ -12,8 +12,8 @@ import type { } from '@/lib/internal/sharepoint/schema' import { createInternalToolFileResult } from '@/lib/internal/tool-operations/file-result' import type { InternalToolOperationResult } from '@/lib/internal/tool-operations/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { SharepointSkippedFile, SharepointUploadError } from '@/tools/sharepoint/types' diff --git a/apps/sim/lib/internal/slack/file-input.test.ts b/apps/sim/lib/internal/slack/file-input.test.ts index fe85dfdc94d..45f3427a944 100644 --- a/apps/sim/lib/internal/slack/file-input.test.ts +++ b/apps/sim/lib/internal/slack/file-input.test.ts @@ -12,7 +12,7 @@ import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import type { SlackOperationError } from '@/lib/internal/slack/errors' import { forEachSlackAttachmentFile } from '@/lib/internal/slack/file-input' diff --git a/apps/sim/lib/internal/slack/file-input.ts b/apps/sim/lib/internal/slack/file-input.ts index de5895943cd..fdc7e91bd56 100644 --- a/apps/sim/lib/internal/slack/file-input.ts +++ b/apps/sim/lib/internal/slack/file-input.ts @@ -1,9 +1,9 @@ import type { Logger } from '@sim/logger' import { SlackOperationError } from '@/lib/internal/slack/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' export interface SlackResolvedFile { diff --git a/apps/sim/lib/internal/square/operations.test.ts b/apps/sim/lib/internal/square/operations.test.ts index 626a823d2ee..2bfeaeca13d 100644 --- a/apps/sim/lib/internal/square/operations.test.ts +++ b/apps/sim/lib/internal/square/operations.test.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { executeSquareCreateCatalogImage } from '@/lib/internal/square/operations' diff --git a/apps/sim/lib/internal/square/operations.ts b/apps/sim/lib/internal/square/operations.ts index 3fb8ffec558..14dcd670971 100644 --- a/apps/sim/lib/internal/square/operations.ts +++ b/apps/sim/lib/internal/square/operations.ts @@ -7,8 +7,8 @@ import { } from '@/lib/core/utils/stream-limits' import type { SquareCatalogImageInput } from '@/lib/internal/square/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import { SQUARE_API_VERSION, SQUARE_BASE_URL } from '@/tools/square/types' diff --git a/apps/sim/lib/internal/ssh/operations.ts b/apps/sim/lib/internal/ssh/operations.ts index 7970d848c99..e1c4b8ba44e 100644 --- a/apps/sim/lib/internal/ssh/operations.ts +++ b/apps/sim/lib/internal/ssh/operations.ts @@ -34,7 +34,7 @@ import { } from '@/lib/internal/ssh/client' import { SshOperationError } from '@/lib/internal/ssh/errors' import { createInternalToolFileResult } from '@/lib/internal/tool-operations/file-result' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' export interface SshOperationContext { signal?: AbortSignal diff --git a/apps/sim/lib/internal/stt/execute-tool.test.ts b/apps/sim/lib/internal/stt/execute-tool.test.ts index 5ad8f4c2d51..c8e261b537b 100644 --- a/apps/sim/lib/internal/stt/execute-tool.test.ts +++ b/apps/sim/lib/internal/stt/execute-tool.test.ts @@ -23,11 +23,11 @@ const { mockDownloadFileFromStorage, mockResolveInternalFileUrl } = fileUtilsSer const { mockIsModelSafeWorkspaceFileKey } = workspaceFileSecretProvenanceMockFns vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/audio/extractor', () => ({ diff --git a/apps/sim/lib/internal/stt/operations.ts b/apps/sim/lib/internal/stt/operations.ts index 5785fa9beaa..e9ffb148a10 100644 --- a/apps/sim/lib/internal/stt/operations.ts +++ b/apps/sim/lib/internal/stt/operations.ts @@ -14,16 +14,13 @@ import type { SttOperationInput } from '@/lib/internal/stt/schema' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { extractStorageKey, getMimeTypeFromExtension, isInternalFileUrl, -} from '@/lib/uploads/utils/file-utils' -import { - downloadFileFromStorage, - resolveInternalFileUrl, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadFileFromStorage, resolveInternalFileUrl } from '@/lib/uploads/utils/file.server' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { TranscriptSegment } from '@/tools/stt/types' diff --git a/apps/sim/lib/internal/supabase/operations.test.ts b/apps/sim/lib/internal/supabase/operations.test.ts index 67ea8d973aa..62e303c6961 100644 --- a/apps/sim/lib/internal/supabase/operations.test.ts +++ b/apps/sim/lib/internal/supabase/operations.test.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { executeSupabaseStorageUpload } from '@/lib/internal/supabase/operations' diff --git a/apps/sim/lib/internal/supabase/operations.ts b/apps/sim/lib/internal/supabase/operations.ts index 33856d6ea81..05f95de0b83 100644 --- a/apps/sim/lib/internal/supabase/operations.ts +++ b/apps/sim/lib/internal/supabase/operations.ts @@ -8,8 +8,8 @@ import { } from '@/lib/core/utils/stream-limits' import type { SupabaseStorageUploadInput } from '@/lib/internal/supabase/schema' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { encodeStoragePath, encodeStorageSegment } from '@/tools/supabase/utils' diff --git a/apps/sim/lib/internal/telegram/operations.test.ts b/apps/sim/lib/internal/telegram/operations.test.ts index 6d881d7b8b0..599b7eb0241 100644 --- a/apps/sim/lib/internal/telegram/operations.test.ts +++ b/apps/sim/lib/internal/telegram/operations.test.ts @@ -14,7 +14,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { sendTelegramDocument } from '@/lib/internal/telegram/operations' diff --git a/apps/sim/lib/internal/telegram/operations.ts b/apps/sim/lib/internal/telegram/operations.ts index b321ac86ee3..4fea2e14764 100644 --- a/apps/sim/lib/internal/telegram/operations.ts +++ b/apps/sim/lib/internal/telegram/operations.ts @@ -6,9 +6,9 @@ import { createInternalToolFileResult, type InternalToolFileResult, } from '@/lib/internal/tool-operations/file-result' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { TelegramSendDocumentResponse } from '@/tools/telegram/types' import { convertMarkdownToHTML } from '@/tools/telegram/utils' diff --git a/apps/sim/lib/internal/textract/document-input.ts b/apps/sim/lib/internal/textract/document-input.ts index a771d3679a9..bd871fb5923 100644 --- a/apps/sim/lib/internal/textract/document-input.ts +++ b/apps/sim/lib/internal/textract/document-input.ts @@ -11,18 +11,18 @@ import { TextractOperationError } from '@/lib/internal/textract/errors' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import { extractStorageKey, isInternalFileUrl, processSingleFileToUserFile, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { downloadServableFileFromStorage, resolveInternalFileUrl, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' type TextractLogger = ReturnType diff --git a/apps/sim/lib/internal/tiktok/operations.ts b/apps/sim/lib/internal/tiktok/operations.ts index ae2c255e2bc..a02fdec061a 100644 --- a/apps/sim/lib/internal/tiktok/operations.ts +++ b/apps/sim/lib/internal/tiktok/operations.ts @@ -13,7 +13,7 @@ import { getMimeTypeFromExtension, processSingleFileToUserFile, resolveTrustedFileContext, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { assertToolFileAccess } from '@/app/api/files/authorization' import { tiktokPublishInitApiDataSchema } from '@/tools/tiktok/api-schemas' import { readTikTokApiResponse } from '@/tools/tiktok/utils' diff --git a/apps/sim/lib/internal/tool-operations/types.ts b/apps/sim/lib/internal/tool-operations/types.ts index cb8f6c3efaa..605899e1adf 100644 --- a/apps/sim/lib/internal/tool-operations/types.ts +++ b/apps/sim/lib/internal/tool-operations/types.ts @@ -1,5 +1,5 @@ import type { Principal } from '@sim/auth/principal' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { InternalToolFileResult } from '@/lib/internal/tool-operations/file-result' import type { ExecutorDelegationOrigin } from '@/executor/types' import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/internal/twilio-voice/operations.ts b/apps/sim/lib/internal/twilio-voice/operations.ts index bc551fbe692..647b39f009e 100644 --- a/apps/sim/lib/internal/twilio-voice/operations.ts +++ b/apps/sim/lib/internal/twilio-voice/operations.ts @@ -14,7 +14,7 @@ import { } from '@/lib/internal/tool-operations/file-result' import { TwilioVoiceOperationError } from '@/lib/internal/twilio-voice/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { getExtensionFromMimeType } from '@/lib/uploads/utils/file-utils' +import { getExtensionFromMimeType } from '@/lib/uploads/utils/file' import type { TwilioGetRecordingParams } from '@/tools/twilio_voice/types' const logger = createLogger('TwilioGetRecordingOperation') diff --git a/apps/sim/lib/internal/uptimerobot/file-input.ts b/apps/sim/lib/internal/uptimerobot/file-input.ts index 6076593cc5d..c55437f8a2b 100644 --- a/apps/sim/lib/internal/uptimerobot/file-input.ts +++ b/apps/sim/lib/internal/uptimerobot/file-input.ts @@ -2,8 +2,8 @@ import type { Logger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { UptimeRobotOperationError } from '@/lib/internal/uptimerobot/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { processFilesToUserFiles, type RawFileInput } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' export async function appendUptimeRobotPspImage(args: { diff --git a/apps/sim/lib/internal/vanta/file-input.test.ts b/apps/sim/lib/internal/vanta/file-input.test.ts index a33bc01444c..3a491efc8a6 100644 --- a/apps/sim/lib/internal/vanta/file-input.test.ts +++ b/apps/sim/lib/internal/vanta/file-input.test.ts @@ -11,9 +11,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { PayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { resolveVantaUploadFile } from '@/lib/internal/vanta/file-input' diff --git a/apps/sim/lib/internal/vanta/file-input.ts b/apps/sim/lib/internal/vanta/file-input.ts index 1665358fb84..b469a2716a4 100644 --- a/apps/sim/lib/internal/vanta/file-input.ts +++ b/apps/sim/lib/internal/vanta/file-input.ts @@ -6,9 +6,9 @@ import { VANTA_MAX_TRANSFER_BYTES, type VantaUploadDocumentFileInput, } from '@/lib/internal/vanta/input' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' diff --git a/apps/sim/lib/internal/video/client.ts b/apps/sim/lib/internal/video/client.ts index 50a204bf37e..2d2fb49aab4 100644 --- a/apps/sim/lib/internal/video/client.ts +++ b/apps/sim/lib/internal/video/client.ts @@ -11,7 +11,7 @@ import { readResponseToBufferWithLimit, } from '@/lib/core/utils/stream-limits' import { type FalAICostMetadata, getFalAICostMetadata } from '@/lib/tools/falai-pricing' -import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromStorage } from '@/lib/uploads/utils/file.server' import type { UserFile } from '@/executor/types' const logger = createLogger('VideoProviderClient') diff --git a/apps/sim/lib/internal/video/operations.test.ts b/apps/sim/lib/internal/video/operations.test.ts index 3a5c3067b3c..5cdd203f7b4 100644 --- a/apps/sim/lib/internal/video/operations.test.ts +++ b/apps/sim/lib/internal/video/operations.test.ts @@ -30,7 +30,7 @@ vi.mock('@/lib/internal/video/client', () => ({ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/internal/video/operations.ts b/apps/sim/lib/internal/video/operations.ts index 0da2c9e2d1e..9f6f7d72967 100644 --- a/apps/sim/lib/internal/video/operations.ts +++ b/apps/sim/lib/internal/video/operations.ts @@ -13,7 +13,7 @@ import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/internal/vision/operations.test.ts b/apps/sim/lib/internal/vision/operations.test.ts index 7b6af7ed9cd..2220ae6410a 100644 --- a/apps/sim/lib/internal/vision/operations.test.ts +++ b/apps/sim/lib/internal/vision/operations.test.ts @@ -27,9 +27,9 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/internal/vision/client', () => ({ analyzeVision: mocks.analyzeVision })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/core/security/input-validation.server', () => inputValidationMock) diff --git a/apps/sim/lib/internal/vision/operations.ts b/apps/sim/lib/internal/vision/operations.ts index 3736d321d03..55c6b337449 100644 --- a/apps/sim/lib/internal/vision/operations.ts +++ b/apps/sim/lib/internal/vision/operations.ts @@ -9,17 +9,14 @@ import type { VisionOperationInput } from '@/lib/internal/vision/schema' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { extractStorageKey, isInternalFileUrl, processSingleFileToUserFile, -} from '@/lib/uploads/utils/file-utils' -import { - downloadFileFromStorage, - resolveInternalFileUrl, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadFileFromStorage, resolveInternalFileUrl } from '@/lib/uploads/utils/file.server' import { assertToolFileAccess } from '@/app/api/files/authorization' const logger = createLogger('VisionOperations') diff --git a/apps/sim/lib/internal/whatsapp/operations.test.ts b/apps/sim/lib/internal/whatsapp/operations.test.ts index ead13e83de4..940c492f227 100644 --- a/apps/sim/lib/internal/whatsapp/operations.test.ts +++ b/apps/sim/lib/internal/whatsapp/operations.test.ts @@ -25,7 +25,7 @@ vi.mock('@/lib/uploads/contexts/execution', () => uploadsExecutionMock) vi.mock('@/lib/uploads/contexts/copilot', () => uploadsCopilotMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/lib/internal/whatsapp/upload', () => ({ uploadWhatsAppMedia: mocks.uploadMedia, diff --git a/apps/sim/lib/internal/whatsapp/operations.ts b/apps/sim/lib/internal/whatsapp/operations.ts index 2ddfef539de..e9f68bc86e7 100644 --- a/apps/sim/lib/internal/whatsapp/operations.ts +++ b/apps/sim/lib/internal/whatsapp/operations.ts @@ -23,7 +23,7 @@ import { import { uploadWhatsAppMedia } from '@/lib/internal/whatsapp/upload' import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot' import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' -import { getExtensionFromMimeType } from '@/lib/uploads/utils/file-utils' +import { getExtensionFromMimeType } from '@/lib/uploads/utils/file' import { sanitizeFileName } from '@/executor/constants' import type { UserFile } from '@/executor/types' import { diff --git a/apps/sim/lib/internal/whatsapp/upload.test.ts b/apps/sim/lib/internal/whatsapp/upload.test.ts index 35199cce37a..7dba182b969 100644 --- a/apps/sim/lib/internal/whatsapp/upload.test.ts +++ b/apps/sim/lib/internal/whatsapp/upload.test.ts @@ -14,11 +14,11 @@ const mocks = vi.hoisted(() => ({ readGraph: vi.fn(), })) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/utils/servable-file-response', () => ({ docNotReadyResponse: mocks.docNotReady, diff --git a/apps/sim/lib/internal/whatsapp/upload.ts b/apps/sim/lib/internal/whatsapp/upload.ts index 8aa0d6452bb..9c9f733bb38 100644 --- a/apps/sim/lib/internal/whatsapp/upload.ts +++ b/apps/sim/lib/internal/whatsapp/upload.ts @@ -1,8 +1,8 @@ import { createLogger } from '@sim/logger' import { readWhatsAppGraphResponse } from '@/lib/internal/whatsapp/client' -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' -import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import type { RawFileInput } from '@/lib/uploads/utils/file' +import { processSingleFileToUserFile } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { docNotReadyResponse } from '@/lib/uploads/utils/servable-file-response' import { assertToolFileAccess } from '@/app/api/files/authorization' import { diff --git a/apps/sim/lib/internal/windchill/operations.test.ts b/apps/sim/lib/internal/windchill/operations.test.ts index 35e9c3c9b4e..f73d5c9dd8c 100644 --- a/apps/sim/lib/internal/windchill/operations.test.ts +++ b/apps/sim/lib/internal/windchill/operations.test.ts @@ -36,9 +36,9 @@ vi.mock('@/lib/internal/windchill/client', () => ({ vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/contexts/copilot', () => uploadsCopilotMock) diff --git a/apps/sim/lib/internal/windchill/operations.ts b/apps/sim/lib/internal/windchill/operations.ts index c9967e51bbb..94e7183de73 100644 --- a/apps/sim/lib/internal/windchill/operations.ts +++ b/apps/sim/lib/internal/windchill/operations.ts @@ -22,9 +22,9 @@ import { WindchillOperationError } from '@/lib/internal/windchill/errors' import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot' import { uploadExecutionFile } from '@/lib/uploads/contexts/execution' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' +import { processFilesToUserFiles } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' -import { processFilesToUserFiles } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import { assertToolFileAccess } from '@/app/api/files/authorization' import { sanitizeFileName } from '@/executor/constants' diff --git a/apps/sim/lib/internal/wordpress/operations.ts b/apps/sim/lib/internal/wordpress/operations.ts index 33d5f1318f2..06559b77abc 100644 --- a/apps/sim/lib/internal/wordpress/operations.ts +++ b/apps/sim/lib/internal/wordpress/operations.ts @@ -6,13 +6,13 @@ import { } from '@/lib/core/utils/stream-limits' import { WordPressOperationError } from '@/lib/internal/wordpress/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' import { getFileExtension, getMimeTypeFromExtension, processSingleFileToUserFile, -} from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' +import type { RawFileInput } from '@/lib/uploads/utils/file-schemas' import { assertToolFileAccess } from '@/app/api/files/authorization' import type { WordPressUploadMediaResponse } from '@/tools/wordpress/types' diff --git a/apps/sim/lib/internal/zoom/operations.ts b/apps/sim/lib/internal/zoom/operations.ts index 72be9339db7..1c93c350421 100644 --- a/apps/sim/lib/internal/zoom/operations.ts +++ b/apps/sim/lib/internal/zoom/operations.ts @@ -10,7 +10,7 @@ import { } from '@/lib/internal/tool-operations/file-result' import { ZoomOperationError } from '@/lib/internal/zoom/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { getExtensionFromMimeType } from '@/lib/uploads/utils/file-utils' +import { getExtensionFromMimeType } from '@/lib/uploads/utils/file' import type { ZoomGetMeetingRecordingsParams } from '@/tools/zoom/types' const logger = createLogger('ZoomOperations') diff --git a/apps/sim/lib/invitations/application/authorize-mutation.ts b/apps/sim/lib/invitations/application/authorize-mutation.ts index 58a3bc2b626..e73b86720da 100644 --- a/apps/sim/lib/invitations/application/authorize-mutation.ts +++ b/apps/sim/lib/invitations/application/authorize-mutation.ts @@ -17,7 +17,7 @@ import { invitationOperations, } from '@/lib/invitations/application/operations' import { getInvitationById } from '@/lib/invitations/core' -import { loadWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface InvitationMutationInput { invitationId: string diff --git a/apps/sim/lib/invitations/application/list-workspace-invitations.test.ts b/apps/sim/lib/invitations/application/list-workspace-invitations.test.ts index b2ab3a57874..a92cdb3e66a 100644 --- a/apps/sim/lib/invitations/application/list-workspace-invitations.test.ts +++ b/apps/sim/lib/invitations/application/list-workspace-invitations.test.ts @@ -8,7 +8,7 @@ import { workspaceContextMock } from '@sim/testing/mocks/workspace-context.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/invitations/core', () => invitationsCoreMock) import { listWorkspaceInvitations } from '@/lib/invitations/application/list-workspace-invitations' diff --git a/apps/sim/lib/invitations/application/list-workspace-invitations.ts b/apps/sim/lib/invitations/application/list-workspace-invitations.ts index ffd094bb85e..2b1efc523f6 100644 --- a/apps/sim/lib/invitations/application/list-workspace-invitations.ts +++ b/apps/sim/lib/invitations/application/list-workspace-invitations.ts @@ -1,7 +1,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { defineWorkspaceOperation } from '@/lib/core/application/workspace-operation' import { listInvitationsForWorkspaces } from '@/lib/invitations/core' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** permission-group-exempt: administrators can inspect and revoke outstanding grants when sending is withheld. */ export const listWorkspaceInvitationsOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/invitations/application/manage-invitation.test.ts b/apps/sim/lib/invitations/application/manage-invitation.test.ts index bc1d7ed9ef5..ba553cfcfaa 100644 --- a/apps/sim/lib/invitations/application/manage-invitation.test.ts +++ b/apps/sim/lib/invitations/application/manage-invitation.test.ts @@ -29,7 +29,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) vi.mock('@/lib/invitations/core', () => invitationsCoreMock) vi.mock('@/lib/invitations/send', () => invitationsSendMock) diff --git a/apps/sim/lib/invitations/application/manage-invitation.ts b/apps/sim/lib/invitations/application/manage-invitation.ts index 3c04ae48435..a451131483e 100644 --- a/apps/sim/lib/invitations/application/manage-invitation.ts +++ b/apps/sim/lib/invitations/application/manage-invitation.ts @@ -21,7 +21,7 @@ import { } from '@/lib/core/orchestration/types' import { getInvitationById } from '@/lib/invitations/core' import { resendInvitationRecord, revokeInvitationRecord } from '@/lib/invitations/mutation-manager' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const invitationManagementOperations = { /** permission-group-exempt: cancellation removes access and remains available when sends are withheld. */ diff --git a/apps/sim/lib/invitations/application/mutations.test.ts b/apps/sim/lib/invitations/application/mutations.test.ts index b94b3627e4f..e8798f1ca2a 100644 --- a/apps/sim/lib/invitations/application/mutations.test.ts +++ b/apps/sim/lib/invitations/application/mutations.test.ts @@ -29,7 +29,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/core/application/organization-authorization', () => organizationAuthorizationMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/invitations/core', () => invitationsCoreMock) vi.mock('@/lib/invitations/mutation-manager', () => ({ resendInvitationRecord: hoisted.resend, diff --git a/apps/sim/lib/invitations/application/send-invitation-batch.test.ts b/apps/sim/lib/invitations/application/send-invitation-batch.test.ts index b05e2ae86c4..ab95519db6a 100644 --- a/apps/sim/lib/invitations/application/send-invitation-batch.test.ts +++ b/apps/sim/lib/invitations/application/send-invitation-batch.test.ts @@ -32,7 +32,7 @@ const hoisted = vi.hoisted(() => ({ orgSend: vi.fn(), workspaceSend: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) diff --git a/apps/sim/lib/invitations/application/send-invitation-batch.ts b/apps/sim/lib/invitations/application/send-invitation-batch.ts index 9e2d7ca5588..9bb034e11bb 100644 --- a/apps/sim/lib/invitations/application/send-invitation-batch.ts +++ b/apps/sim/lib/invitations/application/send-invitation-batch.ts @@ -42,7 +42,7 @@ import { } from '@/lib/invitations/workspace-invitations' import { createOrganizationInvitation } from '@/lib/organizations/application/invitations' import { assertWorkspaceCapability } from '@/lib/permission-groups/capability-assertions' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { getWorkspaceInvitePolicy } from '@/lib/workspaces/policy' import { InvitationsNotAllowedError } from '@/ee/access-control/utils/permission-check' diff --git a/apps/sim/lib/invitations/resend-policy.test.ts b/apps/sim/lib/invitations/resend-policy.test.ts index 658fd5142e0..cb3be86173c 100644 --- a/apps/sim/lib/invitations/resend-policy.test.ts +++ b/apps/sim/lib/invitations/resend-policy.test.ts @@ -30,7 +30,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) vi.mock('@/lib/billing/organizations/membership', () => organizationMembershipMock) -vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) +vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) vi.mock('@/lib/permission-groups/locks', () => permissionGroupLocksMock) vi.mock('@/lib/invitations/core', () => invitationsCoreMock) vi.mock('@/ee/access-control/utils/permission-check', () => permissionCheckMock) diff --git a/apps/sim/lib/invitations/resend-policy.ts b/apps/sim/lib/invitations/resend-policy.ts index a6603cb0843..0bb22ae9588 100644 --- a/apps/sim/lib/invitations/resend-policy.ts +++ b/apps/sim/lib/invitations/resend-policy.ts @@ -1,5 +1,5 @@ import { getOrganizationSubscription } from '@/lib/billing/core/billing' -import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/billing-identity-lock' +import { acquireUserBillingIdentityLock } from '@/lib/billing/organizations/identity-lock' import { acquireOrganizationMutationLock } from '@/lib/billing/organizations/membership' import { isEnterprise, isTeam } from '@/lib/billing/plan-helpers' import { hasUsableSubscriptionStatus } from '@/lib/billing/subscriptions/utils' diff --git a/apps/sim/lib/knowledge/__integration__/application-acl.integration.ts b/apps/sim/lib/knowledge/__integration__/application-acl.integration.ts index 358e2fed5ac..3d1fe53b622 100644 --- a/apps/sim/lib/knowledge/__integration__/application-acl.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/application-acl.integration.ts @@ -52,7 +52,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { encryptSecret } from '@/lib/core/security/encryption' import { getCredentialGroupProviderAdapterByProviderId } from '@/lib/credential-groups/provider-registry' @@ -80,7 +80,7 @@ import { import { createContentSyncLease, createMemberSyncLease } from '@/lib/knowledge/connectors/sync-lock' import { addDocument, persistDocumentAcls } from '@/lib/knowledge/connectors/sync-persistence' import { processDocumentAsync } from '@/lib/knowledge/documents/service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' describe('indexed source content through real application access', () => { const previousConfluenceClient = { diff --git a/apps/sim/lib/knowledge/__integration__/coda-live.integration.ts b/apps/sim/lib/knowledge/__integration__/coda-live.integration.ts index 3b12fe7cb0b..a2d2b9cc993 100644 --- a/apps/sim/lib/knowledge/__integration__/coda-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/coda-live.integration.ts @@ -42,7 +42,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { encryptSecret } from '@/lib/core/security/encryption' import { assertCodaLiveFixture } from '@/lib/knowledge/__integration__/coda-live-fixture' import { seedKnowledgeAclFixture } from '@/lib/knowledge/__integration__/seed-source-access-fixture' diff --git a/apps/sim/lib/knowledge/__integration__/confluence-images.integration.ts b/apps/sim/lib/knowledge/__integration__/confluence-images.integration.ts index 12c0c683b73..1184820dc28 100644 --- a/apps/sim/lib/knowledge/__integration__/confluence-images.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/confluence-images.integration.ts @@ -140,7 +140,7 @@ vi.mock('@/connectors/registry.server', async () => { } }) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/confluence-live.integration.ts b/apps/sim/lib/knowledge/__integration__/confluence-live.integration.ts index 73c2f021b9e..e58d8f8a52c 100644 --- a/apps/sim/lib/knowledge/__integration__/confluence-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/confluence-live.integration.ts @@ -47,7 +47,7 @@ vi.mock('@/lib/embeddings', async () => ({ }), })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { requireCurrentHumanRole } from '@/lib/core/application/workspace-authorization' import { env } from '@/lib/core/config/env' import { loadManagedCredentialGroupBinding } from '@/lib/credential-groups/credentials' @@ -69,7 +69,7 @@ import { } from '@/lib/oauth/credential-service' import { ATLASSIAN_SERVICE_ACCOUNT_PROVIDER_ID } from '@/lib/oauth/types' import { deleteFile } from '@/lib/uploads/core/storage-service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { confluenceConnector } from '@/connectors/confluence/confluence' import { getReadRestriction } from '@/connectors/confluence/permissions' diff --git a/apps/sim/lib/knowledge/__integration__/connector-deferral.integration.ts b/apps/sim/lib/knowledge/__integration__/connector-deferral.integration.ts index 74bc6686252..e69740e29bc 100644 --- a/apps/sim/lib/knowledge/__integration__/connector-deferral.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/connector-deferral.integration.ts @@ -26,7 +26,7 @@ vi.mock('@/connectors/registry.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, diff --git a/apps/sim/lib/knowledge/__integration__/connector-lease-pages.integration.ts b/apps/sim/lib/knowledge/__integration__/connector-lease-pages.integration.ts index 83947ca9007..d2941b9a71d 100644 --- a/apps/sim/lib/knowledge/__integration__/connector-lease-pages.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/connector-lease-pages.integration.ts @@ -42,7 +42,7 @@ vi.mock('@/connectors/registry.server', () => ({ })) import { PROJECTION_ROW_BATCH_SIZE } from '@sim/db/knowledge-projection' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { compileCredentialGroupWorkflowAccessPolicy } from '@/lib/credential-groups/application/workflow-access-policy' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/connector-lifecycle-locks.integration.ts b/apps/sim/lib/knowledge/__integration__/connector-lifecycle-locks.integration.ts index 930026476b3..6e023633444 100644 --- a/apps/sim/lib/knowledge/__integration__/connector-lifecycle-locks.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/connector-lifecycle-locks.integration.ts @@ -25,7 +25,7 @@ vi.mock('@/lib/knowledge/documents/service', async (original) => ({ })), })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, diff --git a/apps/sim/lib/knowledge/__integration__/directory-sync.integration.ts b/apps/sim/lib/knowledge/__integration__/directory-sync.integration.ts index dd7eabe1f87..235ac5c6559 100644 --- a/apps/sim/lib/knowledge/__integration__/directory-sync.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/directory-sync.integration.ts @@ -51,7 +51,7 @@ vi.mock('@/connectors/registry.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, diff --git a/apps/sim/lib/knowledge/__integration__/embedding-insert-batches.integration.ts b/apps/sim/lib/knowledge/__integration__/embedding-insert-batches.integration.ts index b73c367f945..a1ed3837cb3 100644 --- a/apps/sim/lib/knowledge/__integration__/embedding-insert-batches.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/embedding-insert-batches.integration.ts @@ -24,12 +24,12 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ return fixtures.root }, })) -vi.mock('@/lib/knowledge/documents/document-processor', () => ({ +vi.mock('@/lib/knowledge/documents/processor', () => ({ processDocument: fixtures.process, })) vi.mock('@/lib/knowledge/embeddings', () => ({ generateEmbeddings: fixtures.embeddings })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import * as embeddingClient from '@/lib/embeddings/client' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/embedding-processing-recovery.integration.ts b/apps/sim/lib/knowledge/__integration__/embedding-processing-recovery.integration.ts index bdc92a30ea3..a4c0d5a2c0c 100644 --- a/apps/sim/lib/knowledge/__integration__/embedding-processing-recovery.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/embedding-processing-recovery.integration.ts @@ -26,7 +26,7 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { processOutboxEventById } from '@/lib/core/outbox/service' import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' diff --git a/apps/sim/lib/knowledge/__integration__/execution-archive-provenance.integration.ts b/apps/sim/lib/knowledge/__integration__/execution-archive-provenance.integration.ts index fbe7e946692..7a411efc12a 100644 --- a/apps/sim/lib/knowledge/__integration__/execution-archive-provenance.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/execution-archive-provenance.integration.ts @@ -94,12 +94,12 @@ import { createSingleDocument } from '@/lib/knowledge/documents/service' import { loadKnowledgeDocumentSecretRegistry } from '@/lib/knowledge/secret-provenance' import { createCopilotChatPrincipal } from '@/lib/mothership/auth/application-delegation' import { createRegistryContentGate } from '@/lib/mothership/content-delivery/registry-gate' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' import { deleteWorkspaceFile, getWorkspaceFile, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { filterModelSafeWorkspaceFileAttachments, getBoundWorkspaceFileSecretProvenance, @@ -108,7 +108,7 @@ import { isOpaqueWorkspaceFileEgressSafe, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFile, downloadFile } from '@/lib/uploads/core/storage-service' import { createWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/knowledge/__integration__/external-file-provenance.integration.ts b/apps/sim/lib/knowledge/__integration__/external-file-provenance.integration.ts index 5eff2d72592..78b5372a6c4 100644 --- a/apps/sim/lib/knowledge/__integration__/external-file-provenance.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/external-file-provenance.integration.ts @@ -29,14 +29,14 @@ import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, } from '@/lib/knowledge/__integration__/seed-source-access-fixture' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' -import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' +import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenance, importWorkspaceFileSecretProvenanceForModelView, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { downloadFile } from '@/lib/uploads/core/storage-service' import { createWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/knowledge/__integration__/gitlab-live.integration.ts b/apps/sim/lib/knowledge/__integration__/gitlab-live.integration.ts index b1b18e3ffff..03cfab42c74 100644 --- a/apps/sim/lib/knowledge/__integration__/gitlab-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/gitlab-live.integration.ts @@ -76,7 +76,7 @@ import type { UpdateConnectorBody, } from '@/lib/api/contracts/knowledge/connectors' import { decryptApiKey, encryptApiKey } from '@/lib/api-key/crypto' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { seedKnowledgeAclFixture } from '@/lib/knowledge/__integration__/seed-source-access-fixture' import { listKnowledgeChunks } from '@/lib/knowledge/application/chunks' import { updateKnowledgeConnectorAccess } from '@/lib/knowledge/application/connector-access' @@ -85,7 +85,7 @@ import { readKnowledgeDocument } from '@/lib/knowledge/application/documents' import { searchKnowledge } from '@/lib/knowledge/application/search' import { executeSync } from '@/lib/knowledge/connectors/sync-engine' import * as storage from '@/lib/uploads/core/storage-service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { PATCH as updateConnectorRoute } from '@/app/api/knowledge/[id]/connectors/[connectorId]/route' import { POST as createConnectorRoute } from '@/app/api/knowledge/[id]/connectors/route' import { gitlabConnector } from '@/connectors/gitlab/gitlab' diff --git a/apps/sim/lib/knowledge/__integration__/google-drive-live.integration.ts b/apps/sim/lib/knowledge/__integration__/google-drive-live.integration.ts index 068c629441f..99e6aa32199 100644 --- a/apps/sim/lib/knowledge/__integration__/google-drive-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/google-drive-live.integration.ts @@ -44,7 +44,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { encryptSecret } from '@/lib/core/security/encryption' import { seedKnowledgeAclFixture } from '@/lib/knowledge/__integration__/seed-source-access-fixture' @@ -56,7 +56,7 @@ import { executeSync } from '@/lib/knowledge/connectors/sync-engine' import { persistDocumentAcls } from '@/lib/knowledge/connectors/sync-persistence' import { resolveCredentialTokenBundle } from '@/lib/oauth/credential-service' import { deleteFile } from '@/lib/uploads/core/storage-service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { googleWorkspaceDomain } from '@/connectors/google-drive/directory' import { googleDriveConnector } from '@/connectors/google-drive/google-drive' import type { ExternalDocument } from '@/connectors/types' diff --git a/apps/sim/lib/knowledge/__integration__/google-drive-member-live.integration.ts b/apps/sim/lib/knowledge/__integration__/google-drive-member-live.integration.ts index 1ca31b1b7c4..66b304cf182 100644 --- a/apps/sim/lib/knowledge/__integration__/google-drive-member-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/google-drive-member-live.integration.ts @@ -49,7 +49,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { encryptSecret } from '@/lib/core/security/encryption' import { readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' @@ -65,7 +65,7 @@ import { import { executeMemberSync } from '@/lib/knowledge/connectors/member-sync-engine' import { resolveCredentialTokenBundle } from '@/lib/oauth/credential-service' import { deleteFile } from '@/lib/uploads/core/storage-service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { googleDriveConnector } from '@/connectors/google-drive/google-drive' import type { ExternalDocument } from '@/connectors/types' import { PER_MEMBER_LISTING_CONTEXT } from '@/connectors/utils' diff --git a/apps/sim/lib/knowledge/__integration__/google-drive-shortcuts.integration.ts b/apps/sim/lib/knowledge/__integration__/google-drive-shortcuts.integration.ts index eeffefbad5b..6727ad82df7 100644 --- a/apps/sim/lib/knowledge/__integration__/google-drive-shortcuts.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/google-drive-shortcuts.integration.ts @@ -41,7 +41,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, @@ -54,7 +54,7 @@ import * as connectorTokens from '@/lib/knowledge/connectors/access-token' import * as memberAccess from '@/lib/knowledge/connectors/member-access' import { executeMemberSync } from '@/lib/knowledge/connectors/member-sync-engine' import { executeSync } from '@/lib/knowledge/connectors/sync-engine' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' const json = (body: unknown) => Response.json(body) const denied = () => Response.json({ error: { errors: [{ reason: 'notFound' }] } }, { status: 404 }) diff --git a/apps/sim/lib/knowledge/__integration__/listing-continuation.integration.ts b/apps/sim/lib/knowledge/__integration__/listing-continuation.integration.ts index 93d63c1f448..8a687dc2e41 100644 --- a/apps/sim/lib/knowledge/__integration__/listing-continuation.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/listing-continuation.integration.ts @@ -66,7 +66,7 @@ vi.mock('@/connectors/registry.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' import { compileCredentialGroupWorkflowAccessPolicy } from '@/lib/credential-groups/application/workflow-access-policy' import { @@ -81,7 +81,7 @@ import { } from '@/lib/knowledge/application/documents' import { searchKnowledge } from '@/lib/knowledge/application/search' import * as connectorTokens from '@/lib/knowledge/connectors/access-token' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { beginListingCheckpoint, listingFingerprint, @@ -105,7 +105,7 @@ import { import { createContentSyncLease, createMemberSyncLease } from '@/lib/knowledge/connectors/sync-lock' import { addDocument, persistDocumentAcls } from '@/lib/knowledge/connectors/sync-persistence' import * as documentService from '@/lib/knowledge/documents/service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { CONNECTOR_REGISTRY } from '@/connectors/registry.server' import type { ConnectorConfig, ExternalDocument, SyncResult } from '@/connectors/types' diff --git a/apps/sim/lib/knowledge/__integration__/member-scope-withdrawal.integration.ts b/apps/sim/lib/knowledge/__integration__/member-scope-withdrawal.integration.ts index b1da6e7b772..72b4f13a344 100644 --- a/apps/sim/lib/knowledge/__integration__/member-scope-withdrawal.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/member-scope-withdrawal.integration.ts @@ -77,7 +77,7 @@ vi.mock('@/connectors/registry.server', async () => { } }) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { compileCredentialGroupWorkflowAccessPolicy } from '@/lib/credential-groups/application/workflow-access-policy' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/ocr-input-failures.integration.ts b/apps/sim/lib/knowledge/__integration__/ocr-input-failures.integration.ts index e8ace180aea..23fe514e266 100644 --- a/apps/sim/lib/knowledge/__integration__/ocr-input-failures.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/ocr-input-failures.integration.ts @@ -28,7 +28,7 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import * as egress from '@/lib/core/security/input-validation.server' import { getMistralCapacityScope } from '@/lib/internal/mistral/capacity' diff --git a/apps/sim/lib/knowledge/__integration__/processing-lock-scope.integration.ts b/apps/sim/lib/knowledge/__integration__/processing-lock-scope.integration.ts index b05608e1a9a..c2586ebf5ce 100644 --- a/apps/sim/lib/knowledge/__integration__/processing-lock-scope.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/processing-lock-scope.integration.ts @@ -20,12 +20,12 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ return fixtures.root }, })) -vi.mock('@/lib/knowledge/documents/document-processor', () => ({ +vi.mock('@/lib/knowledge/documents/processor', () => ({ processDocument: fixtures.process, })) vi.mock('@/lib/knowledge/embeddings', () => ({ generateEmbeddings: fixtures.embeddings })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import * as embeddingClient from '@/lib/embeddings/client' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/provider-processing-recovery.integration.ts b/apps/sim/lib/knowledge/__integration__/provider-processing-recovery.integration.ts index 7e19e45a1fc..9fd971d6e28 100644 --- a/apps/sim/lib/knowledge/__integration__/provider-processing-recovery.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/provider-processing-recovery.integration.ts @@ -31,7 +31,7 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { processOutboxEventById } from '@/lib/core/outbox/service' import * as egress from '@/lib/core/security/input-validation.server' diff --git a/apps/sim/lib/knowledge/__integration__/providers-live.integration.ts b/apps/sim/lib/knowledge/__integration__/providers-live.integration.ts index d85537c177d..efdc7e4c37d 100644 --- a/apps/sim/lib/knowledge/__integration__/providers-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/providers-live.integration.ts @@ -33,7 +33,7 @@ vi.mock('@/lib/uploads/core/setup.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { encryptSecret } from '@/lib/core/security/encryption' import { compileCredentialGroupWorkflowAccessPolicy } from '@/lib/credential-groups/application/workflow-access-policy' @@ -53,7 +53,7 @@ import { searchKnowledge } from '@/lib/knowledge/application/search' import { grantKnowledgeConnectorCredentialAccess } from '@/lib/knowledge/connectors/member-access' import { createContentSyncLease } from '@/lib/knowledge/connectors/sync-lock' import { addDocument, persistDocumentAcls } from '@/lib/knowledge/connectors/sync-persistence' -import { processDocument } from '@/lib/knowledge/documents/document-processor' +import { processDocument } from '@/lib/knowledge/documents/processor' import { processDocumentAsync } from '@/lib/knowledge/documents/service' import { QUEUED_DISPATCH_GRACE_MS } from '@/lib/knowledge/documents/types' import { generateEmbeddings } from '@/lib/knowledge/embeddings' diff --git a/apps/sim/lib/knowledge/__integration__/scale.integration.ts b/apps/sim/lib/knowledge/__integration__/scale.integration.ts index 31d2d2a3d04..4b00b47fccd 100644 --- a/apps/sim/lib/knowledge/__integration__/scale.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/scale.integration.ts @@ -8,7 +8,7 @@ import { toArray, toRecord } from '@sim/utils/object' import { and, eq, inArray, isNull, type SQL, sql } from 'drizzle-orm' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' import { z } from 'zod' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, diff --git a/apps/sim/lib/knowledge/__integration__/search-source-progress.integration.ts b/apps/sim/lib/knowledge/__integration__/search-source-progress.integration.ts index a173f79707e..0b3e10d5d2b 100644 --- a/apps/sim/lib/knowledge/__integration__/search-source-progress.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/search-source-progress.integration.ts @@ -34,7 +34,7 @@ import { import { KNOWLEDGE_CONNECTOR_DETACH_EVENT } from '@/lib/knowledge/connectors/outbox-events' import { createContentSyncLease } from '@/lib/knowledge/connectors/sync-lock' import { persistSkippedDocuments } from '@/lib/knowledge/connectors/sync-persistence' -import * as documentProcessor from '@/lib/knowledge/documents/document-processor' +import * as documentProcessor from '@/lib/knowledge/documents/processor' import { processDocumentAsync, retryDocumentProcessing } from '@/lib/knowledge/documents/service' const ids = createKnowledgeAclFixtureIds() diff --git a/apps/sim/lib/knowledge/__integration__/search-source-setup.integration.ts b/apps/sim/lib/knowledge/__integration__/search-source-setup.integration.ts index 45fd0ad3615..85f98cabd07 100644 --- a/apps/sim/lib/knowledge/__integration__/search-source-setup.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/search-source-setup.integration.ts @@ -41,7 +41,7 @@ vi.mock('@/connectors/registry.server', () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { ensureWorkspaceAccounts } from '@/lib/credential-groups/application/manage-groups' import { compileCredentialGroupWorkflowAccessPolicy, diff --git a/apps/sim/lib/knowledge/__integration__/slack-empty-threads.integration.ts b/apps/sim/lib/knowledge/__integration__/slack-empty-threads.integration.ts index a0da7d35c56..9c479d7083b 100644 --- a/apps/sim/lib/knowledge/__integration__/slack-empty-threads.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/slack-empty-threads.integration.ts @@ -39,7 +39,7 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, diff --git a/apps/sim/lib/knowledge/__integration__/slack-live.integration.ts b/apps/sim/lib/knowledge/__integration__/slack-live.integration.ts index 029a06871ba..b9e90eb68b2 100644 --- a/apps/sim/lib/knowledge/__integration__/slack-live.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/slack-live.integration.ts @@ -43,7 +43,7 @@ vi.mock('@/lib/embeddings', async () => ({ }), })) -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { loadManagedCredentialGroupBinding } from '@/lib/credential-groups/credentials' import { listKnowledgeChunks } from '@/lib/knowledge/application/chunks' import { readKnowledgeDocument } from '@/lib/knowledge/application/documents' @@ -58,7 +58,7 @@ import { executeSync } from '@/lib/knowledge/connectors/sync-engine' import { resolveCredentialTokenBundle } from '@/lib/oauth/credential-service' import { SLACK_CUSTOM_BOT_PROVIDER_ID } from '@/lib/oauth/types' import { deleteFile } from '@/lib/uploads/core/storage-service' -import { downloadFileFromUrl } from '@/lib/uploads/utils/file-utils.server' +import { downloadFileFromUrl } from '@/lib/uploads/utils/file.server' import { slackConnector } from '@/connectors/slack/slack' import type { ExternalDocument } from '@/connectors/types' diff --git a/apps/sim/lib/knowledge/__integration__/stored-document-recovery.integration.ts b/apps/sim/lib/knowledge/__integration__/stored-document-recovery.integration.ts index 1728fcb3773..0d88b76fb31 100644 --- a/apps/sim/lib/knowledge/__integration__/stored-document-recovery.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/stored-document-recovery.integration.ts @@ -70,8 +70,8 @@ vi.mock('@/lib/embeddings', async () => ({ }, })) -import * as billingAttribution from '@/lib/billing/core/billing-attribution' -import { resolveSystemBillingAttribution } from '@/lib/billing/core/billing-attribution' +import * as billingAttribution from '@/lib/billing/core/attribution' +import { resolveSystemBillingAttribution } from '@/lib/billing/core/attribution' import * as outbox from '@/lib/core/outbox/service' import { createKnowledgeAclFixtureIds, diff --git a/apps/sim/lib/knowledge/__integration__/upload-read-provenance.integration.ts b/apps/sim/lib/knowledge/__integration__/upload-read-provenance.integration.ts index d44f0fc0267..b5f53a8a433 100644 --- a/apps/sim/lib/knowledge/__integration__/upload-read-provenance.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/upload-read-provenance.integration.ts @@ -34,7 +34,7 @@ import { import { generateWorkspaceFileKey, trackChatUpload, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { areModelSafeWorkspaceFileKeys, filterModelSafeWorkspaceFileAttachments, @@ -47,7 +47,7 @@ import { replaceWorkspaceFileSecretProvenanceInTx, snapshotWorkspaceFileSecretProvenanceInTx, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { uploadFile } from '@/lib/uploads/core/storage-service' import { readWorkspaceFileText } from '@/lib/workspace-files/application/read-workspace-file-text' diff --git a/apps/sim/lib/knowledge/__integration__/workspace-import.integration.ts b/apps/sim/lib/knowledge/__integration__/workspace-import.integration.ts index ffdabe61e17..f9bc4a2893b 100644 --- a/apps/sim/lib/knowledge/__integration__/workspace-import.integration.ts +++ b/apps/sim/lib/knowledge/__integration__/workspace-import.integration.ts @@ -62,8 +62,8 @@ import { uploadKnowledgeArtifact } from '@/lib/knowledge/documents/storage-uploa import { deleteWorkspaceFile, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFile, downloadFile } from '@/lib/uploads/core/storage-service' const fixtures: ReturnType[] = [] diff --git a/apps/sim/lib/knowledge/knowledge-base-reference.ts b/apps/sim/lib/knowledge/active-base-reference.ts similarity index 100% rename from apps/sim/lib/knowledge/knowledge-base-reference.ts rename to apps/sim/lib/knowledge/active-base-reference.ts diff --git a/apps/sim/lib/knowledge/api/internal-route.test.ts b/apps/sim/lib/knowledge/api/internal-route.test.ts index 86a2e61e241..4523a4c470d 100644 --- a/apps/sim/lib/knowledge/api/internal-route.test.ts +++ b/apps/sim/lib/knowledge/api/internal-route.test.ts @@ -6,7 +6,7 @@ import { describe, expect, it, vi } from 'vitest' import { BILLING_ATTRIBUTION_HEADER, serializeBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { internalKnowledgeProvenanceUserId, resolveInternalKnowledgeBillingAttribution, diff --git a/apps/sim/lib/knowledge/api/internal-route.ts b/apps/sim/lib/knowledge/api/internal-route.ts index 0b379323e96..a3154755982 100644 --- a/apps/sim/lib/knowledge/api/internal-route.ts +++ b/apps/sim/lib/knowledge/api/internal-route.ts @@ -20,7 +20,7 @@ import { AuthType, type AuthTypeValue } from '@/lib/auth/hybrid' import { requireWorkspaceBillingAttributionHeader, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { PlatformEvents } from '@/lib/core/telemetry' import type { diff --git a/apps/sim/lib/knowledge/application/add-workspace-files.test.ts b/apps/sim/lib/knowledge/application/add-workspace-files.test.ts index d149089ffa2..9b9ece88cbf 100644 --- a/apps/sim/lib/knowledge/application/add-workspace-files.test.ts +++ b/apps/sim/lib/knowledge/application/add-workspace-files.test.ts @@ -33,7 +33,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/core/telemetry', () => telemetryMock) @@ -48,11 +48,11 @@ vi.mock('@/lib/knowledge/documents/storage-upload', () => ({ })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/utils/validation', () => ({ validateFileType: () => null })) diff --git a/apps/sim/lib/knowledge/application/add-workspace-files.ts b/apps/sim/lib/knowledge/application/add-workspace-files.ts index 36ac1b65c9a..bafa74e608d 100644 --- a/apps/sim/lib/knowledge/application/add-workspace-files.ts +++ b/apps/sim/lib/knowledge/application/add-workspace-files.ts @@ -1,7 +1,7 @@ import { AuditAction, AuditResourceType } from '@sim/audit' import { type Principal, resolvePrincipalAuditAttribution } from '@sim/auth/principal' import { generateId } from '@sim/utils/id' -import { checkAttributedUsageLimits } from '@/lib/billing/core/billing-attribution' +import { checkAttributedUsageLimits } from '@/lib/billing/core/attribution' import { authorizeWorkspaceOperation } from '@/lib/core/application' import { asOrchestrationError, OrchestrationError } from '@/lib/core/orchestration/types' import { generateRequestId } from '@/lib/core/utils/request' @@ -27,20 +27,20 @@ import { import { knowledgeOperations } from '@/lib/knowledge/application/operations' import { createSingleDocument } from '@/lib/knowledge/documents/service' import { uploadKnowledgeArtifact } from '@/lib/knowledge/documents/storage-upload' -import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager' +import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/file-manager' import { fetchServableWorkspaceFileBuffer, getWorkspaceFile, loadActiveWorkspaceFileContext, resolveWorkspaceFileReference, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenance, mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { EMPTY_KNOWLEDGE_DOCUMENT_MESSAGE, MAX_KNOWLEDGE_DOCUMENT_FILE_SIZE, diff --git a/apps/sim/lib/knowledge/application/billing.test.ts b/apps/sim/lib/knowledge/application/billing.test.ts index 8d3fd299634..28bcd737be2 100644 --- a/apps/sim/lib/knowledge/application/billing.test.ts +++ b/apps/sim/lib/knowledge/application/billing.test.ts @@ -8,7 +8,7 @@ import { } from '@sim/testing/mocks/billing-attribution.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { resolveKnowledgeAttributedUserId, diff --git a/apps/sim/lib/knowledge/application/billing.ts b/apps/sim/lib/knowledge/application/billing.ts index 222977006c2..3feb40b0ca4 100644 --- a/apps/sim/lib/knowledge/application/billing.ts +++ b/apps/sim/lib/knowledge/application/billing.ts @@ -9,7 +9,7 @@ import { resolveBillingAttribution, resolveOrganizationBillingAttribution, resolveSystemBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import type { KnowledgeResourceContext } from '@/lib/knowledge/application/contexts' diff --git a/apps/sim/lib/knowledge/application/chat.test.ts b/apps/sim/lib/knowledge/application/chat.test.ts index a56e78ea5ea..d79433af8a6 100644 --- a/apps/sim/lib/knowledge/application/chat.test.ts +++ b/apps/sim/lib/knowledge/application/chat.test.ts @@ -35,7 +35,7 @@ vi.mock('@/lib/mothership/application/load-search-integrations', () => ({ })) vi.mock('@/lib/knowledge/access/availability', () => knowledgeAvailabilityMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/request/lifecycle/run', () => ({ runCopilotLifecycle: mocks.lifecycle, })) diff --git a/apps/sim/lib/knowledge/application/chat.ts b/apps/sim/lib/knowledge/application/chat.ts index 778e6e87392..b3ea7ab995e 100644 --- a/apps/sim/lib/knowledge/application/chat.ts +++ b/apps/sim/lib/knowledge/application/chat.ts @@ -10,7 +10,7 @@ import { type WorkspaceSearchFilters, workspaceSearchFiltersSchema, } from '@/lib/api/contracts/knowledge/search' -import { resolveOrganizationBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveOrganizationBillingAttribution } from '@/lib/billing/core/attribution' import type { OperationUseCase } from '@/lib/core/application/operation' import { authorizeOrganizationOperation } from '@/lib/core/application/organization-authorization' import { OrchestrationError } from '@/lib/core/orchestration/types' diff --git a/apps/sim/lib/knowledge/application/connector-access.ts b/apps/sim/lib/knowledge/application/connector-access.ts index 009b3b48278..7bcd21e0718 100644 --- a/apps/sim/lib/knowledge/application/connector-access.ts +++ b/apps/sim/lib/knowledge/application/connector-access.ts @@ -1,7 +1,7 @@ import { AuditAction, AuditResourceType } from '@sim/audit' import { type Principal, resolvePrincipalSubjectUserId } from '@sim/auth/principal' import { isPlainRecord } from '@sim/utils/object' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { resourceScopeFields, diff --git a/apps/sim/lib/knowledge/application/connector-credential.test.ts b/apps/sim/lib/knowledge/application/connector-credential.test.ts index cec0fba94f5..f24e01c0dc3 100644 --- a/apps/sim/lib/knowledge/application/connector-credential.test.ts +++ b/apps/sim/lib/knowledge/application/connector-credential.test.ts @@ -29,7 +29,7 @@ vi.mock('@/lib/credentials/application/provider-catalog', () => ({ requireAvailableServiceAccountCredentialProvider: hoisted.requireService, requireAvailableOAuthCredentialProvider: hoisted.requireOAuth, })) -vi.mock('@/lib/credentials/application/credential-crud', () => ({ +vi.mock('@/lib/credentials/application/crud', () => ({ throwCredentialMutationFailure: vi.fn(), })) vi.mock('@/lib/credentials/orchestration/credential-create', () => ({ diff --git a/apps/sim/lib/knowledge/application/connectors.ts b/apps/sim/lib/knowledge/application/connectors.ts index b60670c0b40..33a2b3ab683 100644 --- a/apps/sim/lib/knowledge/application/connectors.ts +++ b/apps/sim/lib/knowledge/application/connectors.ts @@ -14,7 +14,7 @@ import { toRecord } from '@sim/utils/object' import { escapeLikePattern } from '@sim/utils/string' import { and, asc, desc, eq, inArray, isNull, lt, or, sql } from 'drizzle-orm' import type { ConnectorDocumentFilter } from '@/lib/api/contracts/knowledge/connectors' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { requireCurrentHumanRole } from '@/lib/core/application' import { resolvePrincipalEnvironmentVariable } from '@/lib/core/application/environment-reference' import { requireOrganizationMembership } from '@/lib/core/application/organization-authorization' diff --git a/apps/sim/lib/knowledge/application/contexts.test.ts b/apps/sim/lib/knowledge/application/contexts.test.ts index 7944f5cd237..8f51e8cac5f 100644 --- a/apps/sim/lib/knowledge/application/contexts.test.ts +++ b/apps/sim/lib/knowledge/application/contexts.test.ts @@ -44,7 +44,7 @@ vi.mock('@/lib/knowledge/connectors/service', () => ({ getActiveKnowledgeConnectorReference: hoisted.getConnector, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) diff --git a/apps/sim/lib/knowledge/application/contexts.ts b/apps/sim/lib/knowledge/application/contexts.ts index 87d7485dd35..4c59b8c6359 100644 --- a/apps/sim/lib/knowledge/application/contexts.ts +++ b/apps/sim/lib/knowledge/application/contexts.ts @@ -7,6 +7,7 @@ import { type ResourceOwner, resourceScopeFromOwner } from '@/lib/core/resource- import { knowledgeAccessCondition } from '@/lib/knowledge/access/predicate' import { createKnowledgeAccessProvider } from '@/lib/knowledge/access/scope' import type { KnowledgeAccessProvider, KnowledgeAccessScope } from '@/lib/knowledge/access/types' +import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/active-base-reference' import type { KnowledgeAuthorizationContext, KnowledgeOrganizationAuthorizationContext, @@ -18,7 +19,6 @@ import { } from '@/lib/knowledge/connectors/service' import type { ActiveKnowledgeDocument } from '@/lib/knowledge/documents/service' import { getKnowledgeDocument, getKnowledgeDocumentById } from '@/lib/knowledge/documents/service' -import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/knowledge-base-reference' import { getRestorableKnowledgeBase, type RestorableKnowledgeBase, @@ -29,7 +29,7 @@ import type { DocumentTagDefinition } from '@/lib/knowledge/tags/types' import { loadActiveWorkspaceApplicationContext, loadWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export interface KnowledgeWorkspaceContext extends KnowledgeAuthorizationContext { billedAccountUserId: string diff --git a/apps/sim/lib/knowledge/application/documents.test.ts b/apps/sim/lib/knowledge/application/documents.test.ts index 25761ec99b6..92fe406159a 100644 --- a/apps/sim/lib/knowledge/application/documents.test.ts +++ b/apps/sim/lib/knowledge/application/documents.test.ts @@ -43,7 +43,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/application/contexts', () => knowledgeContextsMock) @@ -60,7 +60,7 @@ vi.mock('@/lib/knowledge/orchestration/documents', () => ({ vi.mock('@/lib/uploads', () => uploadsMock) -vi.mock('@/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager', () => ({ +vi.mock('@/lib/uploads/contexts/knowledge-base/file-manager', () => ({ generateKnowledgeBaseFileKey: hoisted.generateKnowledgeBaseFileKey, })) diff --git a/apps/sim/lib/knowledge/application/documents.ts b/apps/sim/lib/knowledge/application/documents.ts index 300ecfb3640..c2d13725f12 100644 --- a/apps/sim/lib/knowledge/application/documents.ts +++ b/apps/sim/lib/knowledge/application/documents.ts @@ -7,7 +7,7 @@ import { and, eq, isNull } from 'drizzle-orm' import { type BillingAttributionSnapshot, checkAttributedUsageLimits, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { admitContent, authorizeWorkspaceOperation, @@ -69,7 +69,7 @@ import { import { getDocumentTagDefinitions } from '@/lib/knowledge/tags/service' import { validateTagValue, validateTagValueLength } from '@/lib/knowledge/tags/utils' import { StorageService } from '@/lib/uploads' -import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager' +import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/file-manager' import { recordKnowledgeBaseFileOwnership } from '@/lib/uploads/server/metadata' import { EMPTY_KNOWLEDGE_DOCUMENT_MESSAGE, diff --git a/apps/sim/lib/knowledge/application/knowledge-bases.ts b/apps/sim/lib/knowledge/application/knowledge-bases.ts index 738ab7d739a..c387fc6e41c 100644 --- a/apps/sim/lib/knowledge/application/knowledge-bases.ts +++ b/apps/sim/lib/knowledge/application/knowledge-bases.ts @@ -14,6 +14,7 @@ import { PlatformEvents } from '@/lib/core/telemetry' import { generateRequestId } from '@/lib/core/utils/request' import { loadActiveFolderPathIndex, resolveFolderPathFilter } from '@/lib/folders/queries' import { createKnowledgeAccessProvider } from '@/lib/knowledge/access/scope' +import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/active-base-reference' import { knowledgeDelegationPolicy } from '@/lib/knowledge/application/authorization' import { defineAuthorizedKnowledgeUseCase } from '@/lib/knowledge/application/authorized-knowledge-use-case' import { @@ -45,7 +46,6 @@ import { MAX_KNOWLEDGE_FOLDERS_PER_WORKSPACE, } from '@/lib/knowledge/constants' import { getConfiguredKbEmbedding } from '@/lib/knowledge/embeddings' -import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/knowledge-base-reference' import { performDeleteKnowledgeBase, performRestoreKnowledgeBase, diff --git a/apps/sim/lib/knowledge/application/read-original-document.ts b/apps/sim/lib/knowledge/application/read-original-document.ts index 40c99c5038b..19ce88f5974 100644 --- a/apps/sim/lib/knowledge/application/read-original-document.ts +++ b/apps/sim/lib/knowledge/application/read-original-document.ts @@ -12,7 +12,7 @@ import { } from '@/lib/knowledge/secret-provenance' import { isObjectNotFoundError } from '@/lib/uploads/core/errors' import { downloadFile } from '@/lib/uploads/core/storage-service' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' export interface ReadOriginalKnowledgeDocumentInput { knowledgeBaseId: string diff --git a/apps/sim/lib/knowledge/application/search.test.ts b/apps/sim/lib/knowledge/application/search.test.ts index 4134e49312d..5226d242740 100644 --- a/apps/sim/lib/knowledge/application/search.test.ts +++ b/apps/sim/lib/knowledge/application/search.test.ts @@ -62,7 +62,7 @@ vi.mock('@/lib/knowledge/reranker', () => ({ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) diff --git a/apps/sim/lib/knowledge/application/search.ts b/apps/sim/lib/knowledge/application/search.ts index 40b02571c8f..a9fadde7e0d 100644 --- a/apps/sim/lib/knowledge/application/search.ts +++ b/apps/sim/lib/knowledge/application/search.ts @@ -1,10 +1,7 @@ import { type Principal, resolvePrincipalSubjectUserId } from '@sim/auth/principal' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' -import { - type BillingAttributionSnapshot, - toBillingContext, -} from '@/lib/billing/core/billing-attribution' +import { type BillingAttributionSnapshot, toBillingContext } from '@/lib/billing/core/attribution' import { checkSearchUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { recordUsage } from '@/lib/billing/core/usage-log' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' @@ -18,6 +15,7 @@ import { reportDurableSecretProvenanceRefusal } from '@/lib/execution/durable-se import { requireOrganizationSearchAvailable } from '@/lib/knowledge/access/availability' import { createKnowledgeAccessProvider } from '@/lib/knowledge/access/scope' import type { KnowledgeAccessProvider } from '@/lib/knowledge/access/types' +import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/active-base-reference' import { admitKnowledgeChunks } from '@/lib/knowledge/application/admit-knowledge-content' import { defineAuthorizedKnowledgeUseCase } from '@/lib/knowledge/application/authorized-knowledge-use-case' import { @@ -35,7 +33,6 @@ import { instrumentSearchUseCase } from '@/lib/knowledge/application/search-diag import { ALL_TAG_SLOTS } from '@/lib/knowledge/constants' import { getEmbeddingModelInfo, toKbEmbeddingDimensions } from '@/lib/knowledge/embedding-models' import { generateSearchEmbedding, type KbEmbeddingTarget } from '@/lib/knowledge/embeddings' -import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/knowledge-base-reference' import { runWithKnowledgeModelInputProvenance } from '@/lib/knowledge/model-input-provenance' import { hasRerankerCredential, rerank } from '@/lib/knowledge/reranker' import type { RerankerStatus } from '@/lib/knowledge/reranker-models' diff --git a/apps/sim/lib/knowledge/application/slack-search/assistant.integration.ts b/apps/sim/lib/knowledge/application/slack-search/assistant.integration.ts index 5a3f2966f11..8b0374cddcd 100644 --- a/apps/sim/lib/knowledge/application/slack-search/assistant.integration.ts +++ b/apps/sim/lib/knowledge/application/slack-search/assistant.integration.ts @@ -63,7 +63,7 @@ vi.mock('@/lib/knowledge/application/slack-search/onboarding', () => ({ vi.mock('@/lib/knowledge/application/slack-search/title', () => ({ generateSlackSearchChatTitle: async () => undefined, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/application/load-search-integrations', () => ({ loadCopilotSearchIntegrations: async () => '{"connections":[],"available":[]}', })) diff --git a/apps/sim/lib/knowledge/application/slack-search/assistant.test.ts b/apps/sim/lib/knowledge/application/slack-search/assistant.test.ts index 45f5dbb44ec..304c3c7e4b2 100644 --- a/apps/sim/lib/knowledge/application/slack-search/assistant.test.ts +++ b/apps/sim/lib/knowledge/application/slack-search/assistant.test.ts @@ -76,7 +76,7 @@ vi.mock('@/lib/knowledge/application/slack-search/onboarding', () => ({ vi.mock('@/lib/knowledge/application/slack-search/title', () => ({ generateSlackSearchChatTitle: hoisted.title, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/async-runs/repository', () => mothershipAsyncRunsMock) vi.mock('@/lib/mothership/application/load-search-integrations', () => ({ loadCopilotSearchIntegrations: hoisted.inventory, diff --git a/apps/sim/lib/knowledge/application/slack-search/assistant.ts b/apps/sim/lib/knowledge/application/slack-search/assistant.ts index 84776780e27..b211965fbdd 100644 --- a/apps/sim/lib/knowledge/application/slack-search/assistant.ts +++ b/apps/sim/lib/knowledge/application/slack-search/assistant.ts @@ -6,7 +6,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage, toError } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { isRecordLike } from '@sim/utils/object' -import { resolveOrganizationBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveOrganizationBillingAttribution } from '@/lib/billing/core/attribution' import { authorizeOrganizationOperation } from '@/lib/core/application/organization-authorization' import { OrchestrationError } from '@/lib/core/orchestration/types' import { getBaseUrl } from '@/lib/core/utils/urls' diff --git a/apps/sim/lib/knowledge/application/upload-sessions.test.ts b/apps/sim/lib/knowledge/application/upload-sessions.test.ts index 98ecfc2de68..cb29688e254 100644 --- a/apps/sim/lib/knowledge/application/upload-sessions.test.ts +++ b/apps/sim/lib/knowledge/application/upload-sessions.test.ts @@ -30,7 +30,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/application/contexts', () => knowledgeContextsMock) diff --git a/apps/sim/lib/knowledge/application/upload-sessions.ts b/apps/sim/lib/knowledge/application/upload-sessions.ts index acd60f14bd4..82cbfde4229 100644 --- a/apps/sim/lib/knowledge/application/upload-sessions.ts +++ b/apps/sim/lib/knowledge/application/upload-sessions.ts @@ -1,6 +1,6 @@ import { AuditAction, AuditResourceType } from '@sim/audit' import type { Principal } from '@sim/auth/principal' -import { checkAttributedUsageLimits } from '@/lib/billing/core/billing-attribution' +import { checkAttributedUsageLimits } from '@/lib/billing/core/attribution' import { authorizeWorkspaceOperation, type WorkspaceOperation } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { generateRequestId } from '@/lib/core/utils/request' diff --git a/apps/sim/lib/knowledge/connectors/connector-error.test.ts b/apps/sim/lib/knowledge/connectors/error.test.ts similarity index 99% rename from apps/sim/lib/knowledge/connectors/connector-error.test.ts rename to apps/sim/lib/knowledge/connectors/error.test.ts index 369091d7092..7ff2c1f2542 100644 --- a/apps/sim/lib/knowledge/connectors/connector-error.test.ts +++ b/apps/sim/lib/knowledge/connectors/error.test.ts @@ -1,7 +1,7 @@ import { DrizzleQueryError } from 'drizzle-orm/errors' import { describe, expect, it } from 'vitest' import { EmbeddingAPIError } from '@/lib/embeddings/api-error' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' describe('connector failure diagnostics', () => { it('finds embedding failures through concurrent batches and nested cause wrappers', () => { diff --git a/apps/sim/lib/knowledge/connectors/connector-error.ts b/apps/sim/lib/knowledge/connectors/error.ts similarity index 100% rename from apps/sim/lib/knowledge/connectors/connector-error.ts rename to apps/sim/lib/knowledge/connectors/error.ts diff --git a/apps/sim/lib/knowledge/connectors/external-group-sync.ts b/apps/sim/lib/knowledge/connectors/external-group-sync.ts index d1d95f10b44..13d94d92396 100644 --- a/apps/sim/lib/knowledge/connectors/external-group-sync.ts +++ b/apps/sim/lib/knowledge/connectors/external-group-sync.ts @@ -29,7 +29,7 @@ import { resolveConnectorTokenUserId, syncContextForToken, } from '@/lib/knowledge/connectors/access-token' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { requiresConnectorIndexing } from '@/lib/knowledge/connectors/indexing-policy' import { RUNNABLE_CONNECTOR_STATUSES } from '@/lib/knowledge/connectors/sync-lock' import { isRateLimitError } from '@/lib/knowledge/documents/utils' diff --git a/apps/sim/lib/knowledge/connectors/member-provisioning.test.ts b/apps/sim/lib/knowledge/connectors/member-provisioning.test.ts index dec13688df3..0fb44f35f4a 100644 --- a/apps/sim/lib/knowledge/connectors/member-provisioning.test.ts +++ b/apps/sim/lib/knowledge/connectors/member-provisioning.test.ts @@ -16,7 +16,7 @@ vi.mock('@/lib/credential-groups/provider-registry', () => credentialGroupsProvi vi.mock('@/lib/credential-groups/enrollments', () => credentialGroupsEnrollmentsMock) vi.mock('@/lib/knowledge/access/availability', () => knowledgeAvailabilityMock) vi.mock('@/lib/knowledge/connectors/member-queue', () => knowledgeMemberQueueMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/credential-groups/service', () => credentialGroupsServiceMock) vi.mock('@/lib/credential-groups/organization-setup', () => credentialGroupsOrganizationSetupMock) diff --git a/apps/sim/lib/knowledge/connectors/member-queue.test.ts b/apps/sim/lib/knowledge/connectors/member-queue.test.ts index b9af1468b4b..30e728acdf8 100644 --- a/apps/sim/lib/knowledge/connectors/member-queue.test.ts +++ b/apps/sim/lib/knowledge/connectors/member-queue.test.ts @@ -22,7 +22,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const { mockExecuteMemberSync } = vi.hoisted(() => ({ mockExecuteMemberSync: vi.fn() })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/connectors/member-sync-engine', () => ({ executeMemberSync: mockExecuteMemberSync, })) diff --git a/apps/sim/lib/knowledge/connectors/member-queue.ts b/apps/sim/lib/knowledge/connectors/member-queue.ts index 43a9eb6fcf0..d05fceb7d78 100644 --- a/apps/sim/lib/knowledge/connectors/member-queue.ts +++ b/apps/sim/lib/knowledge/connectors/member-queue.ts @@ -12,7 +12,7 @@ import { type BillingAttributionSnapshot, resolveSystemBillingAttribution, resolveSystemOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { resolveTriggerRegion } from '@/lib/core/async-jobs/region' import { isTriggerAvailable } from '@/lib/core/config/trigger-availability' import { resourceScopeFromOwner } from '@/lib/core/resource-scope' diff --git a/apps/sim/lib/knowledge/connectors/member-sync-engine-content-credential.test.ts b/apps/sim/lib/knowledge/connectors/member-sync-engine-content-credential.test.ts index 1821476c930..5332fd09ca5 100644 --- a/apps/sim/lib/knowledge/connectors/member-sync-engine-content-credential.test.ts +++ b/apps/sim/lib/knowledge/connectors/member-sync-engine-content-credential.test.ts @@ -47,7 +47,7 @@ const hoisted = vi.hoisted(() => ({ renew: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/access/availability', () => knowledgeAvailabilityMock) vi.mock('@/lib/credential-groups/credentials', () => credentialGroupsCredentialsMock) vi.mock('@/lib/knowledge/connectors/member-provisioning', () => ({ diff --git a/apps/sim/lib/knowledge/connectors/member-sync-engine.ts b/apps/sim/lib/knowledge/connectors/member-sync-engine.ts index 2ed416cb4bf..2d8318add4f 100644 --- a/apps/sim/lib/knowledge/connectors/member-sync-engine.ts +++ b/apps/sim/lib/knowledge/connectors/member-sync-engine.ts @@ -26,7 +26,7 @@ import { assertBillingAttributionOwner, assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { withResourceOutboundScope } from '@/lib/core/network/resource-scope.server' import { resourceScopeFields, resourceScopeFromOwner } from '@/lib/core/resource-scope' import { resourceScopeCondition } from '@/lib/core/resource-scope.server' @@ -45,7 +45,7 @@ import { resolveConnectorTokenUserId, syncContextForToken, } from '@/lib/knowledge/connectors/access-token' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import type { ImageAdmissionState } from '@/lib/knowledge/connectors/image-admission' import { requiresConnectorIndexing } from '@/lib/knowledge/connectors/indexing-policy' import { diff --git a/apps/sim/lib/knowledge/connectors/queue.ts b/apps/sim/lib/knowledge/connectors/queue.ts index 191bbd4919b..25499b558e6 100644 --- a/apps/sim/lib/knowledge/connectors/queue.ts +++ b/apps/sim/lib/knowledge/connectors/queue.ts @@ -10,7 +10,7 @@ import { assertBillingAttributionOwner, assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { resolveTriggerRegion } from '@/lib/core/async-jobs/region' import { isTriggerAvailable } from '@/lib/core/config/trigger-availability' import { diff --git a/apps/sim/lib/knowledge/connectors/sync-content-pass.test.ts b/apps/sim/lib/knowledge/connectors/sync-content-pass.test.ts index fd7a162093f..c875be1102c 100644 --- a/apps/sim/lib/knowledge/connectors/sync-content-pass.test.ts +++ b/apps/sim/lib/knowledge/connectors/sync-content-pass.test.ts @@ -20,7 +20,7 @@ import { uploadsMetadataMockFns, } from '@sim/testing/mocks/uploads-metadata.mock' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { ConnectorAccessMode } from '@/lib/knowledge/connectors/access-modes' import { beginListingCheckpoint, diff --git a/apps/sim/lib/knowledge/connectors/sync-content-pass.ts b/apps/sim/lib/knowledge/connectors/sync-content-pass.ts index 4e615047aa4..bec3655420f 100644 --- a/apps/sim/lib/knowledge/connectors/sync-content-pass.ts +++ b/apps/sim/lib/knowledge/connectors/sync-content-pass.ts @@ -1,7 +1,7 @@ import { db } from '@sim/db' import { document, knowledgeConnector } from '@sim/db/schema' import { and, eq, gt, inArray, isNotNull, isNull, lt, type SQL, sql } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { DbOrTx } from '@/lib/db/types' import { type ConnectorAccessMode, diff --git a/apps/sim/lib/knowledge/connectors/sync-engine.test.ts b/apps/sim/lib/knowledge/connectors/sync-engine.test.ts index c356acad943..ef7e3308eb2 100644 --- a/apps/sim/lib/knowledge/connectors/sync-engine.test.ts +++ b/apps/sim/lib/knowledge/connectors/sync-engine.test.ts @@ -103,7 +103,7 @@ const { mockGetDocument, mockMapTags, mockListDocuments } = vi.hoisted(() => ({ mockListDocuments: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/connectors/registry.server', () => ({ CONNECTOR_REGISTRY: { diff --git a/apps/sim/lib/knowledge/connectors/sync-engine.ts b/apps/sim/lib/knowledge/connectors/sync-engine.ts index e568485741b..76e1fad02eb 100644 --- a/apps/sim/lib/knowledge/connectors/sync-engine.ts +++ b/apps/sim/lib/knowledge/connectors/sync-engine.ts @@ -18,7 +18,7 @@ import { assertBillingAttributionOwner, assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { withResourceOutboundScope } from '@/lib/core/network/resource-scope.server' import { resourceScopeFields, resourceScopeFromOwner } from '@/lib/core/resource-scope' import { EMPTY_ACL } from '@/lib/knowledge/access/tokens' @@ -36,7 +36,7 @@ import { resolveConnectorTokenUserId, syncContextForToken, } from '@/lib/knowledge/connectors/access-token' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { type DirectoryRefreshResult, directorySyncNotice, diff --git a/apps/sim/lib/knowledge/connectors/sync-persistence.ts b/apps/sim/lib/knowledge/connectors/sync-persistence.ts index 0759377789d..2355a421be8 100644 --- a/apps/sim/lib/knowledge/connectors/sync-persistence.ts +++ b/apps/sim/lib/knowledge/connectors/sync-persistence.ts @@ -14,7 +14,7 @@ import { } from '@/lib/knowledge/access/tokens' import type { MirroredDocumentAcl } from '@/lib/knowledge/access/types' import { aclIsDerived, type ConnectorAccessMode } from '@/lib/knowledge/connectors/access-modes' -import type { ConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import type { ConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { pagesByProjectionRows, rewriteConnectorDocumentAcls, diff --git a/apps/sim/lib/knowledge/connectors/sync-primitives.ts b/apps/sim/lib/knowledge/connectors/sync-primitives.ts index ead9db8a351..6e1669bb535 100644 --- a/apps/sim/lib/knowledge/connectors/sync-primitives.ts +++ b/apps/sim/lib/knowledge/connectors/sync-primitives.ts @@ -10,7 +10,7 @@ import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, asc, desc, eq, inArray, isNotNull, isNull, lt, ne, or, sql } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { isTriggerAvailable } from '@/lib/core/config/trigger-availability' import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' import { withDatabaseReadRetry } from '@/lib/db/read-retry' @@ -18,7 +18,7 @@ import type { ConnectorAccessMode } from '@/lib/knowledge/connectors/access-mode import { type ConnectorFailureDiagnostic, getConnectorFailureDiagnostic, -} from '@/lib/knowledge/connectors/connector-error' +} from '@/lib/knowledge/connectors/error' import { admitVisionImage, type ImageAdmissionState, diff --git a/apps/sim/lib/knowledge/documents/image-document-routing.test.ts b/apps/sim/lib/knowledge/documents/image-document-routing.test.ts index e327c9ed11f..2daa2264f74 100644 --- a/apps/sim/lib/knowledge/documents/image-document-routing.test.ts +++ b/apps/sim/lib/knowledge/documents/image-document-routing.test.ts @@ -28,7 +28,7 @@ vi.mock('@/lib/core/rate-limiter/provider-admission', () => ({ })) vi.mock('@/lib/auth/internal', () => authInternalMock) vi.mock('@/lib/file-parsers', () => fileParsersMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/internal/mistral/operations', () => ({ executeMistralParse: mockExecuteMistralParse, })) @@ -37,8 +37,8 @@ vi.mock('@/lib/knowledge/documents/image-extraction', () => ({ })) import { env } from '@/lib/core/config/env' -import { processDocument } from '@/lib/knowledge/documents/document-processor' import type { ImageExtractionPolicy } from '@/lib/knowledge/documents/image-extraction-policy' +import { processDocument } from '@/lib/knowledge/documents/processor' import { runWithKnowledgeModelInputProvenance } from '@/lib/knowledge/model-input-provenance' const IMAGE_URL = 'https://example.com/schedule.png' diff --git a/apps/sim/lib/knowledge/documents/image-extraction-gemini.ts b/apps/sim/lib/knowledge/documents/image-extraction-gemini.ts index 0252b7f7e5e..a36c981d1f8 100644 --- a/apps/sim/lib/knowledge/documents/image-extraction-gemini.ts +++ b/apps/sim/lib/knowledge/documents/image-extraction-gemini.ts @@ -6,7 +6,7 @@ import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider- import { readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' import { EmbeddingConfigurationError } from '@/lib/embeddings/configuration-error' import { resolveProviderKey } from '@/lib/embeddings/keys' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' import { readBoundedHttpErrorPayload } from '@/lib/knowledge/documents/utils' import { getProviderModels } from '@/providers/models' import { isGemini3OrLaterModel } from '@/providers/utils' diff --git a/apps/sim/lib/knowledge/documents/image-extraction.ts b/apps/sim/lib/knowledge/documents/image-extraction.ts index 9250abaeda7..4d49b8b2399 100644 --- a/apps/sim/lib/knowledge/documents/image-extraction.ts +++ b/apps/sim/lib/knowledge/documents/image-extraction.ts @@ -8,7 +8,6 @@ import { waitForProviderAdmission, } from '@/lib/core/rate-limiter/provider-admission' import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' import { classifyGeminiImageError, GEMINI_IMAGE_PROVIDER_ID, @@ -24,6 +23,7 @@ import { SEMANTIC_IMAGE_MIN_BYTES, } from '@/lib/knowledge/documents/image-extraction-policy' import type { OcrCheckpointContext } from '@/lib/knowledge/documents/ocr-checkpoints' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' import { isRetryableError, retryWithExponentialBackoff } from '@/lib/knowledge/documents/utils' import { createVisionCheckpoint, diff --git a/apps/sim/lib/knowledge/documents/document-indexing-usage.test.ts b/apps/sim/lib/knowledge/documents/indexing-usage.test.ts similarity index 98% rename from apps/sim/lib/knowledge/documents/document-indexing-usage.test.ts rename to apps/sim/lib/knowledge/documents/indexing-usage.test.ts index b76a51d43a2..688f857b52f 100644 --- a/apps/sim/lib/knowledge/documents/document-indexing-usage.test.ts +++ b/apps/sim/lib/knowledge/documents/indexing-usage.test.ts @@ -36,7 +36,7 @@ vi.mock('@/lib/billing/threshold-billing', () => ({ checkAndBillPayerOverageThreshold: mockCheckAndBillPayerOverageThreshold, })) -vi.mock('@/lib/knowledge/documents/document-processor', () => ({ +vi.mock('@/lib/knowledge/documents/processor', () => ({ processDocument: mockProcessDocument, })) @@ -49,7 +49,7 @@ vi.mock('@/lib/knowledge/embedding-models', () => ({ vi.mock('@/lib/knowledge/embeddings', () => knowledgeEmbeddingsMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) @@ -59,7 +59,7 @@ vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) vi.mock('@/providers/utils', () => providersUtilsMock) -import * as billingAttribution from '@/lib/billing/core/billing-attribution' +import * as billingAttribution from '@/lib/billing/core/attribution' import { resetUsageGateCache } from '@/lib/billing/core/usage-gate-cache' import * as embeddingClient from '@/lib/embeddings/client' import { processDocumentAsync } from '@/lib/knowledge/documents/service' diff --git a/apps/sim/lib/knowledge/documents/ocr-checkpoints.test.ts b/apps/sim/lib/knowledge/documents/ocr-checkpoints.test.ts index 43498f3d722..320fc9f1225 100644 --- a/apps/sim/lib/knowledge/documents/ocr-checkpoints.test.ts +++ b/apps/sim/lib/knowledge/documents/ocr-checkpoints.test.ts @@ -19,7 +19,7 @@ vi.mock(import('@/lib/knowledge/model-input-provenance'), async (importOriginal) })) vi.mock('@/lib/file-parsers', () => fileParsersMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/internal/mistral/operations', () => ({ executeMistralParse: hoisted.executeOcr })) import { PDFDocument } from 'pdf-lib' @@ -27,12 +27,12 @@ import { env } from '@/lib/core/config/env' import type { OutboxEventContext } from '@/lib/core/outbox/service' import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' import { OCR_CHECKPOINT_CLEANUP_OUTBOX_EVENT } from '@/lib/knowledge/documents/checkpoint-events' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' -import { processDocument } from '@/lib/knowledge/documents/document-processor' import { cleanupOcrCheckpoint, createOcrCheckpoints, } from '@/lib/knowledge/documents/ocr-checkpoints' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' +import { processDocument } from '@/lib/knowledge/documents/processor' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' const mocks = { diff --git a/apps/sim/lib/knowledge/documents/ocr-checkpoints.ts b/apps/sim/lib/knowledge/documents/ocr-checkpoints.ts index e315766285e..2e5123710e0 100644 --- a/apps/sim/lib/knowledge/documents/ocr-checkpoints.ts +++ b/apps/sim/lib/knowledge/documents/ocr-checkpoints.ts @@ -1,13 +1,13 @@ import { sha256Hex } from '@sim/security/hash' import type { OutboxHandler } from '@/lib/core/outbox/service' import { OCR_CHECKPOINT_CLEANUP_OUTBOX_EVENT } from '@/lib/knowledge/documents/checkpoint-events' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' import type { OcrRequestPolicy } from '@/lib/knowledge/documents/ocr-request-policy' import { createCheckpointCleanupHandler, readFramedCheckpoint, writeFramedCheckpoint, } from '@/lib/knowledge/documents/processing-checkpoint-store' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' import { getKnowledgeOpaqueModelInputRegistry } from '@/lib/knowledge/model-input-provenance' const MAX_CHECKPOINT_TEXT_BYTES = 20 * 1024 * 1024 diff --git a/apps/sim/lib/knowledge/documents/ocr-source-validation.ts b/apps/sim/lib/knowledge/documents/ocr-source-validation.ts index e2308f7c1c3..e0eec57458b 100644 --- a/apps/sim/lib/knowledge/documents/ocr-source-validation.ts +++ b/apps/sim/lib/knowledge/documents/ocr-source-validation.ts @@ -1,4 +1,4 @@ -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' /** Canonical Git LFS pointers are text records smaller than 1 KiB, not the referenced binary. */ const GIT_LFS_POINTER_MAX_BYTES = 1024 diff --git a/apps/sim/lib/knowledge/documents/parser-extension.test.ts b/apps/sim/lib/knowledge/documents/parser-extension.test.ts index dc6b0ee3c75..de6210cf619 100644 --- a/apps/sim/lib/knowledge/documents/parser-extension.test.ts +++ b/apps/sim/lib/knowledge/documents/parser-extension.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { classifyDocumentProcessingFailure } from '@/lib/knowledge/documents/document-processing-error' import { resolveParserExtension } from '@/lib/knowledge/documents/parser-extension' +import { classifyDocumentProcessingFailure } from '@/lib/knowledge/documents/processing-error' describe('resolveParserExtension', () => { it('throws when neither filename nor mime type resolves to a supported parser', () => { diff --git a/apps/sim/lib/knowledge/documents/parser-extension.ts b/apps/sim/lib/knowledge/documents/parser-extension.ts index dd174109f6b..fa8ce31ec44 100644 --- a/apps/sim/lib/knowledge/documents/parser-extension.ts +++ b/apps/sim/lib/knowledge/documents/parser-extension.ts @@ -5,7 +5,7 @@ import { getExtensionFromMimeType, getFileExtension, isInternalFileUrl, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { isAlphanumericExtension, isSupportedExtension, diff --git a/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.test.ts b/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.test.ts index fc4e6a0b428..99d5c1adba1 100644 --- a/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.test.ts +++ b/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.test.ts @@ -1,8 +1,8 @@ import { PDFDocument, StandardFonts } from 'pdf-lib' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' import type { OcrRequestPolicy } from '@/lib/knowledge/documents/ocr-request-policy' import { buildLargestFittingPdfChunk } from '@/lib/knowledge/documents/pdf-ocr-chunking' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' async function createSourcePdf(pageCount: number): Promise { const pdf = await PDFDocument.create() diff --git a/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.ts b/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.ts index 1d4515eac62..7d516e9d16f 100644 --- a/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.ts +++ b/apps/sim/lib/knowledge/documents/pdf-ocr-chunking.ts @@ -1,6 +1,6 @@ import { PDFDocument } from 'pdf-lib' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' import type { OcrRequestPolicy } from '@/lib/knowledge/documents/ocr-request-policy' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' export interface PdfOcrChunk { buffer: Buffer diff --git a/apps/sim/lib/knowledge/documents/pdf-ocr-triage.test.ts b/apps/sim/lib/knowledge/documents/pdf-ocr-triage.test.ts index 7cb77f25392..4f96723bacf 100644 --- a/apps/sim/lib/knowledge/documents/pdf-ocr-triage.test.ts +++ b/apps/sim/lib/knowledge/documents/pdf-ocr-triage.test.ts @@ -30,7 +30,7 @@ vi.mock('@/lib/core/rate-limiter/provider-admission', () => ({ vi.mock('@/lib/auth/internal', () => authInternalMock) vi.mock('@/lib/file-parsers', () => fileParsersMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/internal/mistral/operations', () => ({ executeMistralParse: mockExecuteMistralParse, })) @@ -40,8 +40,8 @@ import { waitForProviderAdmission } from '@/lib/core/rate-limiter/provider-admis import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider-capacity-error' import { FileParserError } from '@/lib/file-parsers/errors' import { MistralOperationError } from '@/lib/internal/mistral/errors' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' -import { processDocument } from '@/lib/knowledge/documents/document-processor' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' +import { processDocument } from '@/lib/knowledge/documents/processor' import { runWithKnowledgeModelInputProvenance } from '@/lib/knowledge/model-input-provenance' const mockParseBuffer = fileParsersMockFns.mockParseBuffer diff --git a/apps/sim/lib/knowledge/documents/processing-continuation-dispatch.test.ts b/apps/sim/lib/knowledge/documents/processing-continuation-dispatch.test.ts index 041b3a34ab0..97cc905f520 100644 --- a/apps/sim/lib/knowledge/documents/processing-continuation-dispatch.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-continuation-dispatch.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/async-jobs/region', () => asyncJobsRegionMock) -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { dispatchDocumentProcessingContinuation } from '@/lib/knowledge/documents/processing-continuation-dispatch' import type { DocumentProcessingLane, diff --git a/apps/sim/lib/knowledge/documents/processing-dispatch.ts b/apps/sim/lib/knowledge/documents/processing-dispatch.ts index 6b67d8ce81d..7719f7e75a8 100644 --- a/apps/sim/lib/knowledge/documents/processing-dispatch.ts +++ b/apps/sim/lib/knowledge/documents/processing-dispatch.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { recordUndispatchedDocumentFailure } from '@/lib/knowledge/documents/processing-claim' import { type DocumentData, diff --git a/apps/sim/lib/knowledge/documents/document-processing-error.test.ts b/apps/sim/lib/knowledge/documents/processing-error.test.ts similarity index 98% rename from apps/sim/lib/knowledge/documents/document-processing-error.test.ts rename to apps/sim/lib/knowledge/documents/processing-error.test.ts index fb31afa2f94..17e3acf2107 100644 --- a/apps/sim/lib/knowledge/documents/document-processing-error.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-error.test.ts @@ -6,7 +6,7 @@ import { classifyDocumentProcessingFailure, MAX_DOCUMENT_CHUNKS, PermanentDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' +} from '@/lib/knowledge/documents/processing-error' describe('document processing failure taxonomy', () => { it('classifies archive safety rejections without exposing technical limits as the remedy', () => { diff --git a/apps/sim/lib/knowledge/documents/document-processing-error.ts b/apps/sim/lib/knowledge/documents/processing-error.ts similarity index 99% rename from apps/sim/lib/knowledge/documents/document-processing-error.ts rename to apps/sim/lib/knowledge/documents/processing-error.ts index a052d809d90..a9ff19d76b4 100644 --- a/apps/sim/lib/knowledge/documents/document-processing-error.ts +++ b/apps/sim/lib/knowledge/documents/processing-error.ts @@ -1,7 +1,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { isFileParserError } from '@/lib/file-parsers/errors' import { ArchiveIntegrityError, ZipBombError } from '@/lib/file-parsers/ooxml-limits' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' export const DOCUMENT_PROCESSING_FAILURE_CODES = [ 'archive_safety_limit', diff --git a/apps/sim/lib/knowledge/documents/processing-outbox-event.ts b/apps/sim/lib/knowledge/documents/processing-outbox-event.ts index 9b9b382b515..f10be265d3f 100644 --- a/apps/sim/lib/knowledge/documents/processing-outbox-event.ts +++ b/apps/sim/lib/knowledge/documents/processing-outbox-event.ts @@ -1,5 +1,5 @@ import type { db } from '@sim/db' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { enqueueOutboxEvent } from '@/lib/core/outbox/service' import { KNOWLEDGE_DOCUMENT_DEFERRED_RETRY_CHECK_EVENT, diff --git a/apps/sim/lib/knowledge/documents/processing-outbox-handler.test.ts b/apps/sim/lib/knowledge/documents/processing-outbox-handler.test.ts index 55bbbb2fdbb..091ee3b1dd9 100644 --- a/apps/sim/lib/knowledge/documents/processing-outbox-handler.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-outbox-handler.test.ts @@ -16,7 +16,7 @@ vi.mock('@/lib/knowledge/documents/processing-claim', () => ({ reclaimStaleDocumentProcessingClaim: mocks.reclaimStaleDocumentProcessingClaim, })) -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { OutboxEventContext } from '@/lib/core/outbox/service' import { KNOWLEDGE_DOCUMENT_PROCESSING_OUTBOX_EVENT } from '@/lib/knowledge/documents/processing-events' import { knowledgeDocumentProcessingOutboxHandlers } from '@/lib/knowledge/documents/processing-outbox-handler' diff --git a/apps/sim/lib/knowledge/documents/processing-outbox-handler.ts b/apps/sim/lib/knowledge/documents/processing-outbox-handler.ts index 897182a4057..631a1802388 100644 --- a/apps/sim/lib/knowledge/documents/processing-outbox-handler.ts +++ b/apps/sim/lib/knowledge/documents/processing-outbox-handler.ts @@ -1,5 +1,5 @@ import { isRecordLike } from '@sim/utils/object' -import { assertBillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import { assertBillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { env, envNumber } from '@/lib/core/config/env' import { isTriggerAvailable } from '@/lib/core/config/trigger-availability' import { @@ -21,16 +21,16 @@ import { VISION_CHECKPOINT_CLEANUP_EVENT, } from '@/lib/knowledge/documents/checkpoint-events' import { checkDeferredDocumentRetry } from '@/lib/knowledge/documents/deferred-retry-check' -import { - getOcrRequestRejection, - isPermanentDocumentProcessingError, - isUsageLimitDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' import { cleanupEmbeddingCheckpoint } from '@/lib/knowledge/documents/embedding-checkpoints' import { cleanupOcrCheckpoint } from '@/lib/knowledge/documents/ocr-checkpoints' import { reclaimStaleDocumentProcessingClaim } from '@/lib/knowledge/documents/processing-claim' import { dispatchDocumentProcessingContinuation } from '@/lib/knowledge/documents/processing-continuation-dispatch' import { KNOWLEDGE_DOCUMENT_CONTINUATION_OUTBOX_EVENT } from '@/lib/knowledge/documents/processing-continuation-event' +import { + getOcrRequestRejection, + isPermanentDocumentProcessingError, + isUsageLimitDocumentProcessingError, +} from '@/lib/knowledge/documents/processing-error' import { KNOWLEDGE_DOCUMENT_DEFERRED_RETRY_CHECK_EVENT, KNOWLEDGE_DOCUMENT_PROCESSING_OUTBOX_EVENT, diff --git a/apps/sim/lib/knowledge/documents/processing-payload.ts b/apps/sim/lib/knowledge/documents/processing-payload.ts index f5dd1466a84..2c6f2682527 100644 --- a/apps/sim/lib/knowledge/documents/processing-payload.ts +++ b/apps/sim/lib/knowledge/documents/processing-payload.ts @@ -2,7 +2,7 @@ import { isRecordLike } from '@sim/utils/object' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' /** * Which shared processing queue a document's indexing pass is admitted through. * diff --git a/apps/sim/lib/knowledge/documents/processing-provider-deferral.test.ts b/apps/sim/lib/knowledge/documents/processing-provider-deferral.test.ts index 7da83c17dbf..c62d648a87e 100644 --- a/apps/sim/lib/knowledge/documents/processing-provider-deferral.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-provider-deferral.test.ts @@ -9,7 +9,7 @@ import { EmbeddingQuotaExhaustedError } from '@/lib/embeddings/client' import { OcrRequestRejectedError, PermanentDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' +} from '@/lib/knowledge/documents/processing-error' import { getProviderCapacityDeferral } from '@/lib/knowledge/documents/processing-provider-deferral' describe('provider capacity deferral classification', () => { diff --git a/apps/sim/lib/knowledge/documents/processing-provider-deferral.ts b/apps/sim/lib/knowledge/documents/processing-provider-deferral.ts index 360e1a9c325..53bdbf12cbc 100644 --- a/apps/sim/lib/knowledge/documents/processing-provider-deferral.ts +++ b/apps/sim/lib/knowledge/documents/processing-provider-deferral.ts @@ -6,7 +6,7 @@ import { ProviderCapacityDeferredError } from '@/lib/core/rate-limiter/provider- import { getOcrRequestRejection, isPermanentDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' +} from '@/lib/knowledge/documents/processing-error' /** * Reads typed capacity failures through OCR's aggregate wrappers. A caller abort diff --git a/apps/sim/lib/knowledge/documents/processing-queue.test.ts b/apps/sim/lib/knowledge/documents/processing-queue.test.ts index d8a0b985cf9..7da032e6669 100644 --- a/apps/sim/lib/knowledge/documents/processing-queue.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-queue.test.ts @@ -16,7 +16,7 @@ import { } from '@sim/testing/mocks/async-jobs-region.mock' import { tasks } from '@trigger.dev/sdk' import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { markInsideTriggerRun, diff --git a/apps/sim/lib/knowledge/documents/processing-recovery.ts b/apps/sim/lib/knowledge/documents/processing-recovery.ts index 2d1e974e17f..58c603552fb 100644 --- a/apps/sim/lib/knowledge/documents/processing-recovery.ts +++ b/apps/sim/lib/knowledge/documents/processing-recovery.ts @@ -7,11 +7,11 @@ import { assertBillingAttributionOwner, resolveSystemBillingAttribution, resolveSystemOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { enqueueOutboxEvent } from '@/lib/core/outbox/service' import { withinDeadline } from '@/lib/core/utils/deadline' import type { DbOrTx } from '@/lib/db/types' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { connectorIndexingCondition } from '@/lib/knowledge/connectors/indexing-policy' import { createDocumentProcessingPayload, diff --git a/apps/sim/lib/knowledge/documents/document-processing-source.test.ts b/apps/sim/lib/knowledge/documents/processing-source.test.ts similarity index 99% rename from apps/sim/lib/knowledge/documents/document-processing-source.test.ts rename to apps/sim/lib/knowledge/documents/processing-source.test.ts index ef3df0d1a39..feb358cc76e 100644 --- a/apps/sim/lib/knowledge/documents/document-processing-source.test.ts +++ b/apps/sim/lib/knowledge/documents/processing-source.test.ts @@ -39,7 +39,7 @@ const { mockProcessDocument: vi.fn(), })) -vi.mock('@/lib/knowledge/documents/document-processor', () => ({ +vi.mock('@/lib/knowledge/documents/processor', () => ({ processDocument: mockProcessDocument, })) @@ -52,7 +52,7 @@ vi.mock('@/lib/knowledge/embedding-models', () => ({ vi.mock('@/lib/knowledge/embeddings', () => knowledgeEmbeddingsMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) @@ -60,7 +60,7 @@ vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) -import * as billingAttribution from '@/lib/billing/core/billing-attribution' +import * as billingAttribution from '@/lib/billing/core/attribution' import { resetUsageGateCache } from '@/lib/billing/core/usage-gate-cache' import { env } from '@/lib/core/config/env' import { @@ -72,11 +72,11 @@ import { EMBEDDING_QUOTA_EXHAUSTED_MESSAGE } from '@/lib/embeddings' import * as embeddingClient from '@/lib/embeddings/client' import { EmbeddingQuotaExhaustedError } from '@/lib/embeddings/client' import { SYSTEM_ACCESS_SCOPE } from '@/lib/knowledge/access/types' +import { KNOWLEDGE_DOCUMENT_CONTINUATION_OUTBOX_EVENT } from '@/lib/knowledge/documents/processing-continuation-event' import { PermanentDocumentProcessingError, UsageLimitDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' -import { KNOWLEDGE_DOCUMENT_CONTINUATION_OUTBOX_EVENT } from '@/lib/knowledge/documents/processing-continuation-event' +} from '@/lib/knowledge/documents/processing-error' import { KNOWLEDGE_DOCUMENT_DEFERRED_RETRY_CHECK_EVENT } from '@/lib/knowledge/documents/processing-events' import { processDocumentAsync, processDocumentsWithQueue } from '@/lib/knowledge/documents/service' import { MAX_PROCESSING_ATTEMPTS } from '@/lib/knowledge/documents/types' diff --git a/apps/sim/lib/knowledge/documents/document-processor-chunk-limit.test.ts b/apps/sim/lib/knowledge/documents/processor-chunk-limit.test.ts similarity index 95% rename from apps/sim/lib/knowledge/documents/document-processor-chunk-limit.test.ts rename to apps/sim/lib/knowledge/documents/processor-chunk-limit.test.ts index 163ccd9c4b5..ebe65215839 100644 --- a/apps/sim/lib/knowledge/documents/document-processor-chunk-limit.test.ts +++ b/apps/sim/lib/knowledge/documents/processor-chunk-limit.test.ts @@ -16,8 +16,8 @@ import { TokenChunker } from '@/lib/chunkers/token-chunker' import { MAX_DOCUMENT_CHUNKS, type PermanentDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' -import { processDocument } from '@/lib/knowledge/documents/document-processor' +} from '@/lib/knowledge/documents/processing-error' +import { processDocument } from '@/lib/knowledge/documents/processor' const mockParseBuffer = fileParsersMockFns.mockParseBuffer diff --git a/apps/sim/lib/knowledge/documents/document-processor-secret-provenance.test.ts b/apps/sim/lib/knowledge/documents/processor-secret-provenance.test.ts similarity index 97% rename from apps/sim/lib/knowledge/documents/document-processor-secret-provenance.test.ts rename to apps/sim/lib/knowledge/documents/processor-secret-provenance.test.ts index 5b234c201ec..4efa0d5cf33 100644 --- a/apps/sim/lib/knowledge/documents/document-processor-secret-provenance.test.ts +++ b/apps/sim/lib/knowledge/documents/processor-secret-provenance.test.ts @@ -30,11 +30,11 @@ vi.mock('@/lib/internal/mistral/operations', () => ({ executeMistralParse: mockExecuteMistralParse, })) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) import { env } from '@/lib/core/config/env' import { RESOLVED_SECRET_PROVENANCE_FIELD } from '@/lib/execution/private-tool-metadata' -import { processDocument } from '@/lib/knowledge/documents/document-processor' +import { processDocument } from '@/lib/knowledge/documents/processor' import { runWithKnowledgeModelInputProvenance } from '@/lib/knowledge/model-input-provenance' const mockParseBuffer = fileParsersMockFns.mockParseBuffer diff --git a/apps/sim/lib/knowledge/documents/document-processor.ts b/apps/sim/lib/knowledge/documents/processor.ts similarity index 99% rename from apps/sim/lib/knowledge/documents/document-processor.ts rename to apps/sim/lib/knowledge/documents/processor.ts index 94546645e74..ad1c1db6016 100644 --- a/apps/sim/lib/knowledge/documents/document-processor.ts +++ b/apps/sim/lib/knowledge/documents/processor.ts @@ -42,12 +42,6 @@ import { getOcrResponseDiagnostic } from '@/lib/internal/mistral/error-diagnosti import { MistralOperationError } from '@/lib/internal/mistral/errors' import { mistralParseInputSchema } from '@/lib/internal/mistral/input' import { executeMistralParse } from '@/lib/internal/mistral/operations' -import { - isPermanentDocumentProcessingError, - MAX_DOCUMENT_CHUNKS, - OcrRequestRejectedError, - PermanentDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' import { extractImageText } from '@/lib/knowledge/documents/image-extraction' import { type ImageExtractionPolicy, @@ -73,6 +67,12 @@ import { type PdfOcrChunk, } from '@/lib/knowledge/documents/pdf-ocr-chunking' import { assessPdfTextLayer } from '@/lib/knowledge/documents/pdf-text-layer' +import { + isPermanentDocumentProcessingError, + MAX_DOCUMENT_CHUNKS, + OcrRequestRejectedError, + PermanentDocumentProcessingError, +} from '@/lib/knowledge/documents/processing-error' import { getProviderCapacityDeferral } from '@/lib/knowledge/documents/processing-provider-deferral' import { resolveRetryDelayMs, retryWithExponentialBackoff } from '@/lib/knowledge/documents/utils' import type { VisionExtractionUsage } from '@/lib/knowledge/documents/vision-checkpoints' @@ -81,11 +81,11 @@ import { getKnowledgeOpaqueModelInputRegistry, projectKnowledgeModelInput, } from '@/lib/knowledge/model-input-provenance' -import { getFileExtension, isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, isInternalFileUrl } from '@/lib/uploads/utils/file' import { type DownloadFileFromUrlOptions, downloadFileFromUrl, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file.server' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import { mistralParserTool } from '@/tools/mistral/parser' import type { MistralParserInput } from '@/tools/mistral/types' diff --git a/apps/sim/lib/knowledge/documents/retry-processing-grace.test.ts b/apps/sim/lib/knowledge/documents/retry-processing-grace.test.ts index b6e3a039e9f..596288eb339 100644 --- a/apps/sim/lib/knowledge/documents/retry-processing-grace.test.ts +++ b/apps/sim/lib/knowledge/documents/retry-processing-grace.test.ts @@ -14,7 +14,7 @@ vi.mock('@/lib/knowledge/documents/processing-outbox-event', () => ({ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/connectors/registry.server', () => ({ CONNECTOR_REGISTRY: {} })) -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { isStuckDocumentSweepEligible } from '@/lib/knowledge/connectors/sync-primitives' import { processDocumentsWithQueue, diff --git a/apps/sim/lib/knowledge/documents/document-secret-provenance-update.test.ts b/apps/sim/lib/knowledge/documents/secret-provenance-update.test.ts similarity index 100% rename from apps/sim/lib/knowledge/documents/document-secret-provenance-update.test.ts rename to apps/sim/lib/knowledge/documents/secret-provenance-update.test.ts diff --git a/apps/sim/lib/knowledge/documents/service.ts b/apps/sim/lib/knowledge/documents/service.ts index db0604b30a3..017aca1c451 100644 --- a/apps/sim/lib/knowledge/documents/service.ts +++ b/apps/sim/lib/knowledge/documents/service.ts @@ -36,7 +36,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { checkIngestionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { recordUsage } from '@/lib/billing/core/usage-log' import { @@ -82,7 +82,7 @@ import { MAX_KNOWLEDGE_ACCESS_CANDIDATES, SYSTEM_ACCESS_SCOPE, } from '@/lib/knowledge/access/types' -import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/connector-error' +import { getConnectorFailureDiagnostic } from '@/lib/knowledge/connectors/error' import { imageExtractionPolicyFor } from '@/lib/knowledge/connectors/image-admission' import { connectorIndexingCondition, @@ -90,6 +90,12 @@ import { } from '@/lib/knowledge/connectors/indexing-policy' import { assertSyncLeaseHeldInTx, type SyncWriteLease } from '@/lib/knowledge/connectors/sync-lock' import { documentConnectorIsActive } from '@/lib/knowledge/documents/connector-lifecycle' +import { createEmbeddingCheckpoints } from '@/lib/knowledge/documents/embedding-checkpoints' +import { + failStaleDocumentProcessingClaim, + recordUndispatchedDocumentFailure, +} from '@/lib/knowledge/documents/processing-claim' +import type { DocumentProcessingContinuation } from '@/lib/knowledge/documents/processing-continuation-dispatch' import { assertDocumentChunkCountWithinLimit, getOcrRequestRejection, @@ -99,17 +105,7 @@ import { PermanentDocumentProcessingError, toPermanentDocumentProcessingError, UsageLimitDocumentProcessingError, -} from '@/lib/knowledge/documents/document-processing-error' -import { - processDocument, - type SourceFileAccess, -} from '@/lib/knowledge/documents/document-processor' -import { createEmbeddingCheckpoints } from '@/lib/knowledge/documents/embedding-checkpoints' -import { - failStaleDocumentProcessingClaim, - recordUndispatchedDocumentFailure, -} from '@/lib/knowledge/documents/processing-claim' -import type { DocumentProcessingContinuation } from '@/lib/knowledge/documents/processing-continuation-dispatch' +} from '@/lib/knowledge/documents/processing-error' import { documentProcessingQueueOptions } from '@/lib/knowledge/documents/processing-lane' import { enqueueDeferredRetryCheck, @@ -144,6 +140,7 @@ import { skippedDocumentCondition, } from '@/lib/knowledge/documents/processing-status' import { DOCUMENT_PROCESSING_STALE_THRESHOLD_MS } from '@/lib/knowledge/documents/processing-timeouts.server' +import { processDocument, type SourceFileAccess } from '@/lib/knowledge/documents/processor' import { enqueueKnowledgeStorageCleanup, getKnowledgeBaseStorageKey, @@ -197,7 +194,7 @@ import { estimateTokenCount } from '@/lib/tokenization/estimators' import { getBoundWorkspaceFileSecretProvenanceByMetadata, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { type FileMetadataRecord, getFileMetadataByKeys } from '@/lib/uploads/server/metadata' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' import type { processDocument as processDocumentTask } from '@/background/knowledge-processing' diff --git a/apps/sim/lib/knowledge/documents/storage-cleanup.ts b/apps/sim/lib/knowledge/documents/storage-cleanup.ts index 05f25820892..7d0e079ae27 100644 --- a/apps/sim/lib/knowledge/documents/storage-cleanup.ts +++ b/apps/sim/lib/knowledge/documents/storage-cleanup.ts @@ -16,7 +16,7 @@ import { KNOWLEDGE_STORAGE_CLEANUP_EVENT } from '@/lib/knowledge/documents/stora import { deleteFile } from '@/lib/uploads/core/storage-service' import { deleteFileMetadataByIdentity, getFileMetadataByKeys } from '@/lib/uploads/server/metadata' import { headProviderObject, uploadStorageProvider } from '@/lib/uploads/upload-session/provider' -import { extractStorageKey } from '@/lib/uploads/utils/file-utils' +import { extractStorageKey } from '@/lib/uploads/utils/file' const logger = createLogger('KnowledgeStorageCleanup') const ENQUEUE_BATCH_SIZE = 100 diff --git a/apps/sim/lib/knowledge/documents/stored-artifact-extension.test.ts b/apps/sim/lib/knowledge/documents/stored-artifact-extension.test.ts index 6ce50b6d050..bff0a63ef3a 100644 --- a/apps/sim/lib/knowledge/documents/stored-artifact-extension.test.ts +++ b/apps/sim/lib/knowledge/documents/stored-artifact-extension.test.ts @@ -13,10 +13,10 @@ import { } from '@sim/testing/mocks/file-utils-server.mock' import { describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) -import { processDocument } from '@/lib/knowledge/documents/document-processor' import { resolveStoredArtifactExtension } from '@/lib/knowledge/documents/parser-extension' +import { processDocument } from '@/lib/knowledge/documents/processor' const mockDownload = fileUtilsServerMockFns.mockDownloadFileFromUrl diff --git a/apps/sim/lib/knowledge/documents/unreadable-document.test.ts b/apps/sim/lib/knowledge/documents/unreadable-document.test.ts index c66985aee8c..d485e87ebbc 100644 --- a/apps/sim/lib/knowledge/documents/unreadable-document.test.ts +++ b/apps/sim/lib/knowledge/documents/unreadable-document.test.ts @@ -30,9 +30,9 @@ vi.mock('@/lib/core/rate-limiter/provider-admission', () => ({ })) vi.mock('@/lib/file-parsers', () => fileParsersMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) -import { processDocument } from '@/lib/knowledge/documents/document-processor' +import { processDocument } from '@/lib/knowledge/documents/processor' const mockParseBuffer = fileParsersMockFns.mockParseBuffer diff --git a/apps/sim/lib/knowledge/documents/workspace-source-provenance.test.ts b/apps/sim/lib/knowledge/documents/workspace-source-provenance.test.ts index b8721ba01dd..fe18a2acceb 100644 --- a/apps/sim/lib/knowledge/documents/workspace-source-provenance.test.ts +++ b/apps/sim/lib/knowledge/documents/workspace-source-provenance.test.ts @@ -14,7 +14,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/billing/storage', () => billingStorageMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/knowledge/embeddings.test.ts b/apps/sim/lib/knowledge/embeddings.test.ts index 4acea7d8ccb..e61c6d0190c 100644 --- a/apps/sim/lib/knowledge/embeddings.test.ts +++ b/apps/sim/lib/knowledge/embeddings.test.ts @@ -10,7 +10,7 @@ import { type MockInstance, vi, } from 'vitest' -import * as billingAttributionModule from '@/lib/billing/core/billing-attribution' +import * as billingAttributionModule from '@/lib/billing/core/attribution' import * as usageLogModule from '@/lib/billing/core/usage-log' import * as thresholdBillingModule from '@/lib/billing/threshold-billing' import * as embeddingModelsModule from '@/lib/knowledge/embedding-models' diff --git a/apps/sim/lib/knowledge/embeddings.ts b/apps/sim/lib/knowledge/embeddings.ts index 21ae9d2a49b..e12a007ecbd 100644 --- a/apps/sim/lib/knowledge/embeddings.ts +++ b/apps/sim/lib/knowledge/embeddings.ts @@ -1,9 +1,6 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' -import { - type BillingAttributionSnapshot, - toBillingContext, -} from '@/lib/billing/core/billing-attribution' +import { type BillingAttributionSnapshot, toBillingContext } from '@/lib/billing/core/attribution' import { recordUsage } from '@/lib/billing/core/usage-log' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { env, envNumber } from '@/lib/core/config/env' @@ -17,7 +14,7 @@ import { OllamaEmbeddingWidthUnknownError, } from '@/lib/embeddings/ollama-model-catalog.server' import type { EmbeddingBatchCheckpoints } from '@/lib/embeddings/types' -import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/document-processing-error' +import { PermanentDocumentProcessingError } from '@/lib/knowledge/documents/processing-error' import { assertKbEmbeddingModel, DEFAULT_EMBEDDING_MODEL, diff --git a/apps/sim/lib/knowledge/orchestration/connector-access.ts b/apps/sim/lib/knowledge/orchestration/connector-access.ts index 2e4dece6ea1..2a71b798312 100644 --- a/apps/sim/lib/knowledge/orchestration/connector-access.ts +++ b/apps/sim/lib/knowledge/orchestration/connector-access.ts @@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, eq, inArray, isNull } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { resourceScopeFields, diff --git a/apps/sim/lib/knowledge/orchestration/connectors.ts b/apps/sim/lib/knowledge/orchestration/connectors.ts index 5e2e9ecc951..d157987d8a0 100644 --- a/apps/sim/lib/knowledge/orchestration/connectors.ts +++ b/apps/sim/lib/knowledge/orchestration/connectors.ts @@ -13,7 +13,7 @@ import { getPostgresErrorCode, toError } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, eq, isNull, sql } from 'drizzle-orm' import { encryptApiKey } from '@/lib/api-key/crypto' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { hasWorkspaceLiveSyncAccess, isOrganizationOnEnterprisePlan, diff --git a/apps/sim/lib/knowledge/orchestration/documents.ts b/apps/sim/lib/knowledge/orchestration/documents.ts index 0dff7ca4055..98e9faecb43 100644 --- a/apps/sim/lib/knowledge/orchestration/documents.ts +++ b/apps/sim/lib/knowledge/orchestration/documents.ts @@ -1,7 +1,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit' import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { PlatformEvents } from '@/lib/core/telemetry' import { generateRequestId } from '@/lib/core/utils/request' diff --git a/apps/sim/lib/knowledge/orchestration/knowledge-bases.ts b/apps/sim/lib/knowledge/orchestration/knowledge-bases.ts index 26caf24c2aa..985f80e566a 100644 --- a/apps/sim/lib/knowledge/orchestration/knowledge-bases.ts +++ b/apps/sim/lib/knowledge/orchestration/knowledge-bases.ts @@ -2,9 +2,9 @@ import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit' import { createLogger } from '@sim/logger' import { PlatformEvents } from '@/lib/core/telemetry' import { generateRequestId } from '@/lib/core/utils/request' +import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/active-base-reference' import { DEFAULT_CHUNKING_CONFIG } from '@/lib/knowledge/constants' import { getConfiguredKbEmbedding } from '@/lib/knowledge/embeddings' -import type { ActiveKnowledgeBaseReference } from '@/lib/knowledge/knowledge-base-reference' import { auditActorFields, classifyKnowledgeFailure, diff --git a/apps/sim/lib/knowledge/search/search-index.ts b/apps/sim/lib/knowledge/search/search-index.ts index b55cdb92730..48bd3e9c1bd 100644 --- a/apps/sim/lib/knowledge/search/search-index.ts +++ b/apps/sim/lib/knowledge/search/search-index.ts @@ -7,7 +7,7 @@ import { ACTIVE_KNOWLEDGE_BASE_REFERENCE_FIELDS, type ActiveKnowledgeBaseReference, toActiveKnowledgeBaseReference, -} from '@/lib/knowledge/knowledge-base-reference' +} from '@/lib/knowledge/active-base-reference' /** * Resolves the single active Enterprise Search index owned by a workspace or organization, as diff --git a/apps/sim/lib/knowledge/service.ts b/apps/sim/lib/knowledge/service.ts index a9d17d09b18..1d15fd27556 100644 --- a/apps/sim/lib/knowledge/service.ts +++ b/apps/sim/lib/knowledge/service.ts @@ -36,12 +36,12 @@ import { findActiveFolder, resolveRestoredFolderId } from '@/lib/folders/queries import { isKnowledgeMemberAccessAvailable } from '@/lib/knowledge/access/availability' import { knowledgeAccessCondition } from '@/lib/knowledge/access/predicate' import type { KnowledgeAccessProvider } from '@/lib/knowledge/access/types' -import { mirrorsSourceAcls } from '@/lib/knowledge/connectors/access-modes' import { ACTIVE_KNOWLEDGE_BASE_REFERENCE_FIELDS, type ActiveKnowledgeBaseReference, toActiveKnowledgeBaseReference, -} from '@/lib/knowledge/knowledge-base-reference' +} from '@/lib/knowledge/active-base-reference' +import { mirrorsSourceAcls } from '@/lib/knowledge/connectors/access-modes' import { type KnowledgeReadAccess, knowledgeReadAccessBatches } from '@/lib/knowledge/read-access' import { lockOrganizationSearchApproval } from '@/lib/knowledge/search/integration-policy' import type { diff --git a/apps/sim/lib/knowledge/transfer/bundle.ts b/apps/sim/lib/knowledge/transfer/bundle.ts index 4b47ae4a4ca..cbe66b9d61d 100644 --- a/apps/sim/lib/knowledge/transfer/bundle.ts +++ b/apps/sim/lib/knowledge/transfer/bundle.ts @@ -36,7 +36,7 @@ import { MAX_KNOWLEDGE_BUNDLE_DOCUMENTS, SUPPORTED_FIELD_TYPES, } from '@/lib/knowledge/constants' -import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/document-processing-error' +import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/processing-error' import { MAX_KNOWLEDGE_DOCUMENT_FILE_SIZE } from '@/lib/uploads/shared/types' import { safeZipLeafName } from '@/lib/uploads/zip-entry-path' diff --git a/apps/sim/lib/knowledge/transfer/export-archive.test.ts b/apps/sim/lib/knowledge/transfer/export-archive.test.ts index 7bee0ddafdc..27c5b21d65d 100644 --- a/apps/sim/lib/knowledge/transfer/export-archive.test.ts +++ b/apps/sim/lib/knowledge/transfer/export-archive.test.ts @@ -19,7 +19,7 @@ vi.mock('@/lib/knowledge/transfer/export-source', () => ({ })) import type { KnowledgeBaseExportBundle } from '@/lib/knowledge/application/exports' -import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/document-processing-error' +import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/processing-error' import { buildKnowledgeBundleArchive, knowledgeBundleFileName, diff --git a/apps/sim/lib/knowledge/transfer/export-archive.ts b/apps/sim/lib/knowledge/transfer/export-archive.ts index 1a8a2f97f34..ce6dc33a16c 100644 --- a/apps/sim/lib/knowledge/transfer/export-archive.ts +++ b/apps/sim/lib/knowledge/transfer/export-archive.ts @@ -8,7 +8,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { decodeDataUriWithinLimit } from '@/lib/file-parsers/data-uri' import type { KnowledgeBaseExportBundle } from '@/lib/knowledge/application/exports' import { KNOWLEDGE_BUNDLE_VERSION } from '@/lib/knowledge/constants' -import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/document-processing-error' +import { MAX_DOCUMENT_CHUNKS } from '@/lib/knowledge/documents/processing-error' import { bundleEntryPaths, encodeVectorBase64, diff --git a/apps/sim/lib/logs/application/get-log-stats.ts b/apps/sim/lib/logs/application/get-log-stats.ts index d54993e31e7..f6b53ab846a 100644 --- a/apps/sim/lib/logs/application/get-log-stats.ts +++ b/apps/sim/lib/logs/application/get-log-stats.ts @@ -8,7 +8,7 @@ import { folderScopeCondition, resolveLogFolderScope } from '@/lib/logs/folder-s import { buildLogFilters, type LogFilters } from '@/lib/logs/public-filters' import { buildDashboardStats, resolveLogStatsWindow } from '@/lib/logs/stats' import { readLogStatsBounds, readLogStatsSegments } from '@/lib/logs/stats-queries' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface GetLogStatsInput { workspaceId: string diff --git a/apps/sim/lib/logs/application/get-public-log.ts b/apps/sim/lib/logs/application/get-public-log.ts index 2442e533af8..830e4d76ca2 100644 --- a/apps/sim/lib/logs/application/get-public-log.ts +++ b/apps/sim/lib/logs/application/get-public-log.ts @@ -19,7 +19,7 @@ import { sanitizeExecutionSnapshotState } from '@/lib/logs/snapshot-sanitizer' import { type ActiveWorkspaceApplicationContext, loadActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' type PublicWorkflowLog = NonNullable>> diff --git a/apps/sim/lib/logs/application/list-logs.test.ts b/apps/sim/lib/logs/application/list-logs.test.ts index a2355bd0b36..a1143758a85 100644 --- a/apps/sim/lib/logs/application/list-logs.test.ts +++ b/apps/sim/lib/logs/application/list-logs.test.ts @@ -22,7 +22,7 @@ vi.mock('@/lib/logs/list-logs', () => ({ readLogs: hoisted.readLogs, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/logs/application/list-logs.ts b/apps/sim/lib/logs/application/list-logs.ts index c829933e339..a3448125455 100644 --- a/apps/sim/lib/logs/application/list-logs.ts +++ b/apps/sim/lib/logs/application/list-logs.ts @@ -12,7 +12,7 @@ import { logProjectionSubjectUserId, resolveLogFieldProjection, } from '@/lib/logs/projection' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const authorizedListLogsUseCase = defineAuthorizedWorkspaceUseCase({ operation: logOperations.list, diff --git a/apps/sim/lib/logs/application/list-public-logs.ts b/apps/sim/lib/logs/application/list-public-logs.ts index 56965a8593a..86da1ad9c56 100644 --- a/apps/sim/lib/logs/application/list-public-logs.ts +++ b/apps/sim/lib/logs/application/list-public-logs.ts @@ -20,7 +20,7 @@ import { type PublicLogSortField, readPublicLogPage, } from '@/lib/logs/public-queries' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface ListPublicLogsInput { workspaceId: string diff --git a/apps/sim/lib/logs/application/log-analytics-use-cases.test.ts b/apps/sim/lib/logs/application/log-analytics-use-cases.test.ts index 0205eee70d6..d5cfbfcec42 100644 --- a/apps/sim/lib/logs/application/log-analytics-use-cases.test.ts +++ b/apps/sim/lib/logs/application/log-analytics-use-cases.test.ts @@ -14,7 +14,7 @@ const hoisted = vi.hoisted(() => ({ folderCondition: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/logs/application/public-log-projection.test.ts b/apps/sim/lib/logs/application/public-log-projection.test.ts index 8aac0087b2d..5ce51a6f82e 100644 --- a/apps/sim/lib/logs/application/public-log-projection.test.ts +++ b/apps/sim/lib/logs/application/public-log-projection.test.ts @@ -41,7 +41,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/logs/application/public-log-use-cases.test.ts b/apps/sim/lib/logs/application/public-log-use-cases.test.ts index 3dc9ac7de77..cc577c229bf 100644 --- a/apps/sim/lib/logs/application/public-log-use-cases.test.ts +++ b/apps/sim/lib/logs/application/public-log-use-cases.test.ts @@ -19,7 +19,7 @@ const hoisted = vi.hoisted(() => ({ listLogs: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/logs/application/read-execution-snapshot.test.ts b/apps/sim/lib/logs/application/read-execution-snapshot.test.ts index 8b7bfa1f4e4..5c173e4f59d 100644 --- a/apps/sim/lib/logs/application/read-execution-snapshot.test.ts +++ b/apps/sim/lib/logs/application/read-execution-snapshot.test.ts @@ -37,7 +37,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/logs/execution/trace-store', () => traceStoreMock) diff --git a/apps/sim/lib/logs/application/read-execution-snapshot.ts b/apps/sim/lib/logs/application/read-execution-snapshot.ts index b515f61d325..cdeb115139d 100644 --- a/apps/sim/lib/logs/application/read-execution-snapshot.ts +++ b/apps/sim/lib/logs/application/read-execution-snapshot.ts @@ -21,7 +21,7 @@ import type { TraceSpan, WorkflowExecutionLog } from '@/lib/logs/types' import { type ActiveWorkspaceApplicationContext, resolveActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' const CHILD_SNAPSHOT_QUERY_CHUNK_SIZE = 1_000 diff --git a/apps/sim/lib/logs/application/read-log-detail.test.ts b/apps/sim/lib/logs/application/read-log-detail.test.ts index 939d2ea1ce4..d5e12fe2b16 100644 --- a/apps/sim/lib/logs/application/read-log-detail.test.ts +++ b/apps/sim/lib/logs/application/read-log-detail.test.ts @@ -24,7 +24,7 @@ vi.mock('@/lib/logs/fetch-log-detail', () => ({ readLogDetail: hoisted.readLogDetail, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) diff --git a/apps/sim/lib/logs/application/read-log-detail.ts b/apps/sim/lib/logs/application/read-log-detail.ts index 486d1512285..2866bbb6819 100644 --- a/apps/sim/lib/logs/application/read-log-detail.ts +++ b/apps/sim/lib/logs/application/read-log-detail.ts @@ -15,7 +15,7 @@ import { logProjectionSubjectUserId, resolveLogFieldProjection } from '@/lib/log import { type ActiveWorkspaceApplicationContext, resolveActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' export interface ReadLogDetailInput { workspaceId: string diff --git a/apps/sim/lib/logs/execution/completion-ledger-order.integration.ts b/apps/sim/lib/logs/execution/completion-ledger-order.integration.ts index f1c41610836..8c786ad5ca7 100644 --- a/apps/sim/lib/logs/execution/completion-ledger-order.integration.ts +++ b/apps/sim/lib/logs/execution/completion-ledger-order.integration.ts @@ -16,7 +16,7 @@ import { createDeferred } from '@sim/testing' import { generateId } from '@sim/utils/id' import { eq, sql } from 'drizzle-orm' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { acquireAdvisoryXactLock } from '@/lib/db/advisory-locks' import { buildCostLedger } from '@/lib/logs/cost-ledger' import { executionLogger } from '@/lib/logs/execution/logger' diff --git a/apps/sim/lib/logs/execution/hydrate-child-traces.ts b/apps/sim/lib/logs/execution/hydrate-child-traces.ts index b47f7adbf69..c59f2b92735 100644 --- a/apps/sim/lib/logs/execution/hydrate-child-traces.ts +++ b/apps/sim/lib/logs/execution/hydrate-child-traces.ts @@ -3,7 +3,7 @@ import { customBlock, workflowExecutionLogs } from '@sim/db/schema' import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { inArray } from 'drizzle-orm' -import { flattenWorkflowChildren } from '@/lib/logs/execution/trace-spans/span-factory' +import { flattenWorkflowChildren } from '@/lib/logs/execution/trace-spans/factory' import { materializeExecutionDataForDisplay, stripJoinedChildTraceSpend, diff --git a/apps/sim/lib/logs/execution/logger.test.ts b/apps/sim/lib/logs/execution/logger.test.ts index 9af4277d1b1..cd4af8d0b79 100644 --- a/apps/sim/lib/logs/execution/logger.test.ts +++ b/apps/sim/lib/logs/execution/logger.test.ts @@ -86,7 +86,7 @@ afterAll(resetDbChainMock) // Mock billing modules vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/calculations/usage-monitor', () => billingUsageMonitorMock) diff --git a/apps/sim/lib/logs/execution/logger.ts b/apps/sim/lib/logs/execution/logger.ts index 3ce60b29d77..c355cf19314 100644 --- a/apps/sim/lib/logs/execution/logger.ts +++ b/apps/sim/lib/logs/execution/logger.ts @@ -17,10 +17,7 @@ import { import { generateId } from '@sim/utils/id' import { and, eq, inArray, sql } from 'drizzle-orm' import { checkUsageStatus as checkResolvedUsageStatus } from '@/lib/billing/calculations/usage-monitor' -import { - type BillingAttributionSnapshot, - toBillingContext, -} from '@/lib/billing/core/billing-attribution' +import { type BillingAttributionSnapshot, toBillingContext } from '@/lib/billing/core/attribution' import { readSoftGateUsageCost } from '@/lib/billing/core/reporting-usage-cache' import { getHighestPriorityPersonalSubscription, diff --git a/apps/sim/lib/logs/execution/logging-session.ts b/apps/sim/lib/logs/execution/logging-session.ts index eb63439f432..69f7bd65e24 100644 --- a/apps/sim/lib/logs/execution/logging-session.ts +++ b/apps/sim/lib/logs/execution/logging-session.ts @@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger' import { describeError, toError } from '@sim/utils/errors' import { and, eq, sql } from 'drizzle-orm' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { isRetryableInfrastructureError } from '@/lib/core/errors/retryable-infrastructure' import { RESERVATION_TTL_BUFFER_MS } from '@/lib/core/execution-limits' import type { LargeValueStoreContext } from '@/lib/execution/payloads/store' diff --git a/apps/sim/lib/logs/execution/trace-spans/span-factory.ts b/apps/sim/lib/logs/execution/trace-spans/factory.ts similarity index 100% rename from apps/sim/lib/logs/execution/trace-spans/span-factory.ts rename to apps/sim/lib/logs/execution/trace-spans/factory.ts diff --git a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts index f1674a33e93..f0c8dde8f82 100644 --- a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts +++ b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts @@ -1,6 +1,6 @@ import { isUserFile } from '@/lib/core/utils/user-file' +import { createSpanFromLog } from '@/lib/logs/execution/trace-spans/factory' import { groupIterationBlocks } from '@/lib/logs/execution/trace-spans/iteration-grouping' -import { createSpanFromLog } from '@/lib/logs/execution/trace-spans/span-factory' import type { TraceSpan } from '@/lib/logs/types' import type { BlockLog, ExecutionResult } from '@/executor/types' diff --git a/apps/sim/lib/logs/snapshot-sanitizer.ts b/apps/sim/lib/logs/snapshot-sanitizer.ts index 90fe3cd37a5..6e8bc3a5f83 100644 --- a/apps/sim/lib/logs/snapshot-sanitizer.ts +++ b/apps/sim/lib/logs/snapshot-sanitizer.ts @@ -1,4 +1,4 @@ -import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor' +import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/extractor' import type { WorkflowState } from '@/stores/workflows/workflow/types' /** diff --git a/apps/sim/lib/logs/stats-queries.ts b/apps/sim/lib/logs/stats-queries.ts index 3907502ca5c..8dead30b84f 100644 --- a/apps/sim/lib/logs/stats-queries.ts +++ b/apps/sim/lib/logs/stats-queries.ts @@ -2,7 +2,7 @@ import { dbReplica } from '@sim/db' import { workflow, workflowExecutionLogs } from '@sim/db/schema' import { eq, type SQL, sql } from 'drizzle-orm' import { handledErrorSpanCondition } from '@/lib/logs/handled-errors' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' /** Oldest and newest run start in the filtered set, or nulls when it is empty. */ export interface LogStatsBounds { diff --git a/apps/sim/lib/logs/types.ts b/apps/sim/lib/logs/types.ts index 7245ff89f5e..d284bb333d9 100644 --- a/apps/sim/lib/logs/types.ts +++ b/apps/sim/lib/logs/types.ts @@ -1,5 +1,5 @@ import type { Edge } from '@xyflow/react' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import type { ParentIteration, SerializableExecutionState } from '@/executor/execution/types' import type { diff --git a/apps/sim/lib/mcp/application/workflow-deployments.test.ts b/apps/sim/lib/mcp/application/workflow-deployments.test.ts index 646602f658e..cb894544d32 100644 --- a/apps/sim/lib/mcp/application/workflow-deployments.test.ts +++ b/apps/sim/lib/mcp/application/workflow-deployments.test.ts @@ -20,7 +20,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/mcp/orchestration', () => ({ performCreateWorkflowMcpServer: vi.fn(), diff --git a/apps/sim/lib/mcp/application/workflow-deployments.ts b/apps/sim/lib/mcp/application/workflow-deployments.ts index 276953352c6..8e8ea2aac83 100644 --- a/apps/sim/lib/mcp/application/workflow-deployments.ts +++ b/apps/sim/lib/mcp/application/workflow-deployments.ts @@ -30,7 +30,7 @@ import { generateToolInputSchema, sanitizeToolName, } from '@/lib/mcp/workflow-tool-schema' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const MAX_LISTED_WORKFLOW_MCP_SERVERS = 100 const MAX_LISTED_WORKFLOW_MCP_TOOLS = 2000 diff --git a/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.test.ts b/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.test.ts index df93714865e..f16629523de 100644 --- a/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.test.ts +++ b/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/mcp/pubsub', () => mcpPubsubMock) -vi.mock('@/lib/workflows/triggers/trigger-utils.server', () => ({ +vi.mock('@/lib/workflows/triggers/utils.server', () => ({ hasValidStartBlock: vi.fn(), })) vi.mock('@/lib/mcp/workflow-mcp-sync', () => ({ @@ -16,7 +16,7 @@ import { performCreateWorkflowMcpServer, performUpdateWorkflowMcpTool, } from '@/lib/mcp/orchestration/workflow-mcp-lifecycle' -import { hasValidStartBlock } from '@/lib/workflows/triggers/trigger-utils.server' +import { hasValidStartBlock } from '@/lib/workflows/triggers/utils.server' describe('workflow MCP lifecycle orchestration', () => { beforeEach(() => { diff --git a/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.ts b/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.ts index 4dd1cad048e..bc6f114da3c 100644 --- a/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.ts +++ b/apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.ts @@ -34,7 +34,7 @@ import { pruneOverridesToSchema, sanitizeToolName, } from '@/lib/mcp/workflow-tool-schema' -import { hasValidStartBlock } from '@/lib/workflows/triggers/trigger-utils.server' +import { hasValidStartBlock } from '@/lib/workflows/triggers/utils.server' const logger = createLogger('WorkflowMcpOrchestration') diff --git a/apps/sim/lib/mcp/workflow-mcp-sync.test.ts b/apps/sim/lib/mcp/workflow-mcp-sync.test.ts index fd4fc4b41da..f5bbb7f6533 100644 --- a/apps/sim/lib/mcp/workflow-mcp-sync.test.ts +++ b/apps/sim/lib/mcp/workflow-mcp-sync.test.ts @@ -14,7 +14,7 @@ const { mocks } = vi.hoisted(() => ({ vi.mock('@/lib/mcp/server-locks', () => ({ acquireWorkflowMcpServerLock: mocks.acquireLock, })) -vi.mock('@/lib/workflows/triggers/trigger-utils', () => ({ +vi.mock('@/lib/workflows/triggers/utils', () => ({ hasValidStartBlockInState: mocks.hasValidStartBlock, })) vi.mock('@/lib/workflows/persistence/utils', () => workflowsPersistenceUtilsMock) diff --git a/apps/sim/lib/mcp/workflow-mcp-sync.ts b/apps/sim/lib/mcp/workflow-mcp-sync.ts index 3e979ef7f16..827dd5c5a43 100644 --- a/apps/sim/lib/mcp/workflow-mcp-sync.ts +++ b/apps/sim/lib/mcp/workflow-mcp-sync.ts @@ -17,7 +17,7 @@ import { validateMcpToolMetadataForStorage, } from '@/lib/mcp/tool-limits' import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils' -import { hasValidStartBlockInState } from '@/lib/workflows/triggers/trigger-utils' +import { hasValidStartBlockInState } from '@/lib/workflows/triggers/utils' import type { InputFormatField } from '@/lib/workflows/types' import type { WorkflowState } from '@/stores/workflows/workflow/types' import { mcpPubSub } from './pubsub' diff --git a/apps/sim/lib/media/ffmpeg-content.integration.ts b/apps/sim/lib/media/ffmpeg-content.integration.ts index 9c4557e634d..eb67a572af0 100644 --- a/apps/sim/lib/media/ffmpeg-content.integration.ts +++ b/apps/sim/lib/media/ffmpeg-content.integration.ts @@ -26,11 +26,11 @@ import { getWorkspaceFile, updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/memory/application/agent-turns.test.ts b/apps/sim/lib/memory/application/agent-turns.test.ts index 79e2847732f..38054278ae0 100644 --- a/apps/sim/lib/memory/application/agent-turns.test.ts +++ b/apps/sim/lib/memory/application/agent-turns.test.ts @@ -16,7 +16,7 @@ const hoisted = vi.hoisted(() => ({ storeArtifact: vi.fn(), readArtifact: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/memory/conversation-store', () => ({ openAgentMemoryTurn: hoisted.open, diff --git a/apps/sim/lib/memory/application/agent-turns.ts b/apps/sim/lib/memory/application/agent-turns.ts index 8d694a8b10d..d24c065274f 100644 --- a/apps/sim/lib/memory/application/agent-turns.ts +++ b/apps/sim/lib/memory/application/agent-turns.ts @@ -19,7 +19,7 @@ import { type SaveAgentMemoryTurnInput, saveAgentMemoryTurn, } from '@/lib/memory/conversation-store' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' function requireMatchingInvocation( principal: WorkflowExecutionDelegatedPrincipal, diff --git a/apps/sim/lib/memory/application/authorization.ts b/apps/sim/lib/memory/application/authorization.ts index d845c9f2a5b..41e094a2ac8 100644 --- a/apps/sim/lib/memory/application/authorization.ts +++ b/apps/sim/lib/memory/application/authorization.ts @@ -1,5 +1,5 @@ import type { WorkspaceDelegationPolicy } from '@/lib/core/application' -import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const MEMORY_DELEGATION_AUDIENCE = 'sim:memory' diff --git a/apps/sim/lib/memory/application/retrieval.test.ts b/apps/sim/lib/memory/application/retrieval.test.ts index b0df6c36e09..d370f1637ae 100644 --- a/apps/sim/lib/memory/application/retrieval.test.ts +++ b/apps/sim/lib/memory/application/retrieval.test.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const hoisted = vi.hoisted(() => ({ read: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/memory/conversation-store', () => ({ readConversationItems: hoisted.read })) vi.mock('@/lib/memory/retrieval-prefix', () => ({ diff --git a/apps/sim/lib/memory/application/retrieval.ts b/apps/sim/lib/memory/application/retrieval.ts index aa91e71f55b..23c58cbfebd 100644 --- a/apps/sim/lib/memory/application/retrieval.ts +++ b/apps/sim/lib/memory/application/retrieval.ts @@ -7,7 +7,7 @@ import { type RetrieveMemoryInput, retrieveMemory, } from '@/lib/memory/retrieval' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const retrieveAgentMemoryUseCase = defineAuthorizedWorkspaceUseCase({ operation: memoryOperations.retrieve, diff --git a/apps/sim/lib/memory/application/summaries.ts b/apps/sim/lib/memory/application/summaries.ts index f8346d3ebe9..687a8b9627f 100644 --- a/apps/sim/lib/memory/application/summaries.ts +++ b/apps/sim/lib/memory/application/summaries.ts @@ -7,7 +7,7 @@ import { type SaveMemorySummaryInput, saveMemorySummary, } from '@/lib/memory/summary-store' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const readAgentMemorySummaryUseCase = defineAuthorizedWorkspaceUseCase({ operation: memoryOperations.readSummary, diff --git a/apps/sim/lib/memory/application/use-cases.test.ts b/apps/sim/lib/memory/application/use-cases.test.ts index dbefb5f6c71..10f25d50523 100644 --- a/apps/sim/lib/memory/application/use-cases.test.ts +++ b/apps/sim/lib/memory/application/use-cases.test.ts @@ -7,7 +7,7 @@ import { workspaceContextMockFns, } from '@sim/testing/mocks/workspace-context.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' const hoisted = vi.hoisted(() => ({ readBoundProvenance: vi.fn(), @@ -21,14 +21,14 @@ vi.mock('@/lib/memory/conversation-store', () => ({ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/memory/secret-provenance', () => ({ readBoundMemorySecretProvenance: hoisted.readBoundProvenance, replaceMemorySecretProvenanceInTx: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { listMemoriesUseCase } from '@/lib/memory/application/use-cases' import type { PlainMemoryReadBudget } from '@/lib/memory/read-budget' diff --git a/apps/sim/lib/memory/application/use-cases.ts b/apps/sim/lib/memory/application/use-cases.ts index ea42e74c54d..fcf14cf05f5 100644 --- a/apps/sim/lib/memory/application/use-cases.ts +++ b/apps/sim/lib/memory/application/use-cases.ts @@ -8,8 +8,8 @@ import { memory, memorySecretProvenance } from '@sim/db/schema' import { getPostgresErrorCode } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, eq, inArray, isNull, like } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' -import { assertBillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' +import { assertBillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { @@ -22,7 +22,7 @@ import { appendMemoryMessages, readPlainMemoryTail } from '@/lib/memory/conversa import { lockMemoryConversationInTx } from '@/lib/memory/locks' import { PlainMemoryReadBudget } from '@/lib/memory/read-budget' import { readBoundMemorySecretProvenance } from '@/lib/memory/secret-provenance' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const PRIVATE_MEMORY_QUERY_CHUNK_SIZE = 1_000 const MAX_MEMORY_LIST_LIMIT = 1_000 diff --git a/apps/sim/lib/memory/conversation-store.integration.ts b/apps/sim/lib/memory/conversation-store.integration.ts index 66f3811d8ca..323a695a4aa 100644 --- a/apps/sim/lib/memory/conversation-store.integration.ts +++ b/apps/sim/lib/memory/conversation-store.integration.ts @@ -38,7 +38,7 @@ vi.mock('@/lib/logs/execution/pii-redaction', () => ({ vi.mock('@/lib/tokenization/accurate', () => ({ getAccurateTokenCount: (text: string) => text.length, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => ({ +vi.mock('@/lib/workspaces/application/context', () => ({ resolveActiveWorkspaceApplicationContext: async (workspaceId: string) => ({ workspaceId, workspaceOrganizationId: null, diff --git a/apps/sim/lib/memory/message-provenance.integration.ts b/apps/sim/lib/memory/message-provenance.integration.ts index 4f1bd0579c8..a706f483f58 100644 --- a/apps/sim/lib/memory/message-provenance.integration.ts +++ b/apps/sim/lib/memory/message-provenance.integration.ts @@ -43,7 +43,7 @@ vi.mock('@/lib/logs/execution/pii-redaction', () => ({ vi.mock('@/lib/tokenization/accurate', () => ({ getAccurateTokenCount: (text: string) => text.length, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => ({ +vi.mock('@/lib/workspaces/application/context', () => ({ resolveActiveWorkspaceApplicationContext: async () => ({ workspaceId: 'workspace-1', workspaceOrganizationId: null, diff --git a/apps/sim/lib/memory/message-provenance.test.ts b/apps/sim/lib/memory/message-provenance.test.ts index a9f17ce77b5..13970743255 100644 --- a/apps/sim/lib/memory/message-provenance.test.ts +++ b/apps/sim/lib/memory/message-provenance.test.ts @@ -16,7 +16,7 @@ import { assert, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/security/encryption', () => encryptionMock) vi.mock('@/lib/logs/execution/pii-redaction', () => piiRedactionMock) vi.mock('@/lib/tokenization/accurate', () => tokenizationAccurateMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { hashDurableSecretProvenanceValue, diff --git a/apps/sim/lib/memory/summary-store.integration.ts b/apps/sim/lib/memory/summary-store.integration.ts index e607707d3bf..840e82093fd 100644 --- a/apps/sim/lib/memory/summary-store.integration.ts +++ b/apps/sim/lib/memory/summary-store.integration.ts @@ -29,7 +29,7 @@ vi.mock('@sim/platform-authz/workspace', () => ({ resolveEffectiveWorkspacePermission: async () => 'write', permissionSatisfies: () => true, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => ({ +vi.mock('@/lib/workspaces/application/context', () => ({ resolveActiveWorkspaceApplicationContext: async (workspaceId: string) => ({ workspaceId, workspaceOrganizationId: null, diff --git a/apps/sim/lib/mothership/__integration__/content-delivery-fixture.ts b/apps/sim/lib/mothership/__integration__/content-delivery-fixture.ts index 7b8131ccdb9..09aa0a6e442 100644 --- a/apps/sim/lib/mothership/__integration__/content-delivery-fixture.ts +++ b/apps/sim/lib/mothership/__integration__/content-delivery-fixture.ts @@ -29,9 +29,9 @@ import { seedKnowledgeAclFixture, } from '@/lib/knowledge/__integration__/seed-source-access-fixture' import { embeddingVectorValues } from '@/lib/knowledge/vector-columns' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' -import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' +import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { indexWorkspaceFileForSearch } from '@/lib/workspace-files/search/indexing' export const ORIGIN = 'http://localhost:3000' diff --git a/apps/sim/lib/mothership/__integration__/content-delivery.integration.ts b/apps/sim/lib/mothership/__integration__/content-delivery.integration.ts index ef1af3b2524..ed4ceb43c83 100644 --- a/apps/sim/lib/mothership/__integration__/content-delivery.integration.ts +++ b/apps/sim/lib/mothership/__integration__/content-delivery.integration.ts @@ -139,14 +139,14 @@ import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-ke import { generateImageServerTool } from '@/lib/mothership/tools/server/image/generate-image' import { generateAudioServerTool } from '@/lib/mothership/tools/server/media/generate-audio' import { generateVideoServerTool } from '@/lib/mothership/tools/server/media/generate-video' -import { getShareForResource } from '@/lib/public-shares/share-manager' +import { getShareForResource } from '@/lib/public-shares/manager' import { createOwnedWorkspaceFile, getWorkspaceFile, updateWorkspaceFileContent as replaceFixtureFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { resolveServableDoc } from '@/lib/uploads/documents/compile' import { storeCompiledDoc } from '@/lib/uploads/documents/compiled-store' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' diff --git a/apps/sim/lib/mothership/agent-cli/csv-workflow-execution.live.test.ts b/apps/sim/lib/mothership/agent-cli/csv-workflow-execution.live.test.ts index 234a0ce3e7d..4fe04fbd75d 100644 --- a/apps/sim/lib/mothership/agent-cli/csv-workflow-execution.live.test.ts +++ b/apps/sim/lib/mothership/agent-cli/csv-workflow-execution.live.test.ts @@ -26,7 +26,7 @@ import { runCli } from '@/lib/mothership/agent-cli/run-cli' import type { uploadWorkspaceFile, WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { GET as downloadFileRoute } from '@/app/api/v2/files/[fileId]/route' import { POST as createFileRoute } from '@/app/api/v2/files/route' import { POST as executeRoute } from '@/app/api/v2/workflows/[workflowId]/execute/route' @@ -207,16 +207,16 @@ vi.mock('@/lib/execution/remote-sandbox', async (importOriginal) => ({ throw new Error('Remote compute is outside this local proof') }), })) -vi.mock('@/lib/public-shares/share-manager', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/lib/public-shares/manager', async (importOriginal) => ({ + ...(await importOriginal()), getShareForResource: async () => null, })) vi.mock('@sim/platform-authz/workspace', async (importOriginal) => ({ ...(await importOriginal()), resolveEffectiveWorkspacePermission: vi.fn(async () => fixtures.permission), })) -vi.mock('@/lib/workspaces/application/workspace-context', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/lib/workspaces/application/context', async (importOriginal) => ({ + ...(await importOriginal()), resolveActiveWorkspaceApplicationContext: async (workspaceId: string) => ({ workspaceId, workspaceOrganizationId: null, @@ -245,10 +245,8 @@ vi.mock('@/lib/internal/principals/executor', async (importOriginal) => ({ } }, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', async (importOriginal) => ({ - ...(await importOriginal< - typeof import('@/lib/uploads/contexts/workspace/workspace-file-manager') - >()), +vi.mock('@/lib/uploads/contexts/workspace/file-manager', async (importOriginal) => ({ + ...(await importOriginal()), ...workspaceStorage, })) vi.mock('@/lib/uploads/contexts/workspace', async (importOriginal) => ({ @@ -274,8 +272,8 @@ vi.mock('@/lib/uploads/server/metadata', async (importOriginal) => ({ getFileMetadataByKey: async (key: string) => [...fixtures.files.values()].find((file) => file.record.key === key)?.record ?? null, })) -vi.mock('@/lib/uploads/utils/file-utils.server', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/lib/uploads/utils/file.server', async (importOriginal) => ({ + ...(await importOriginal()), downloadServableFileFromStorage: async (file: { key: string }) => { const stored = [...fixtures.files.values()].find((entry) => entry.record.key === file.key) if (!stored) throw new Error('Missing local fixture bytes') diff --git a/apps/sim/lib/mothership/agent-cli/curation.ts b/apps/sim/lib/mothership/agent-cli/curation.ts index 4d56d8eb6f6..7294d7ea2b4 100644 --- a/apps/sim/lib/mothership/agent-cli/curation.ts +++ b/apps/sim/lib/mothership/agent-cli/curation.ts @@ -16,7 +16,7 @@ import { withToolBindingHints } from '@/lib/mothership/agent-cli/tool-binding-hi import { agentCliFail } from '@/lib/mothership/agent-cli/types' import type { AgentCliRawResult } from '@/lib/mothership/generated/agent-cli' import { createToolAccessGate } from '@/lib/permission-groups/operation-access' -import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs' +import { getBlockOutputs } from '@/lib/workflows/blocks/outputs' import { inputFormatValueSchema } from '@/lib/workflows/input-format-schema' import { getUserPermissionConfig } from '@/ee/access-control/utils/permission-check' diff --git a/apps/sim/lib/mothership/agent-cli/engines/file-read.ts b/apps/sim/lib/mothership/agent-cli/engines/file-read.ts index 3357e3d8d00..9d4b2cd8c42 100644 --- a/apps/sim/lib/mothership/agent-cli/engines/file-read.ts +++ b/apps/sim/lib/mothership/agent-cli/engines/file-read.ts @@ -6,13 +6,13 @@ import { observePrivateFile } from '@/lib/mothership/agent-cli/engines/observe-p import { readScratchFile } from '@/lib/mothership/agent-cli/engines/scratch-file-read' import { type AgentCliEngine, agentCliFail, agentCliOk } from '@/lib/mothership/agent-cli/types' import { readChatAttachment } from '@/lib/mothership/chat/application/read-attachment' -import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/file-manager' import { getFileExtension, getMimeTypeFromExtension, needsRenderedArtifact, resolveEffectiveMimeType, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { fileOperations } from '@/lib/workspace-files/application/operations' import { resolveWorkspaceFileReference } from '@/lib/workspace-files/application/resolve-workspace-file-reference' import { workspaceFileTextFormat } from '@/lib/workspace-files/text-format' diff --git a/apps/sim/lib/mothership/agent-cli/engines/file-view.ts b/apps/sim/lib/mothership/agent-cli/engines/file-view.ts index 99a3b42bb3e..34d201efb33 100644 --- a/apps/sim/lib/mothership/agent-cli/engines/file-view.ts +++ b/apps/sim/lib/mothership/agent-cli/engines/file-view.ts @@ -10,8 +10,8 @@ import { agentCliFail, } from '@/lib/mothership/agent-cli/types' import { readChatAttachment } from '@/lib/mothership/chat/application/read-attachment' -import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/file-manager' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { readWorkspaceFileArtifact } from '@/lib/workspace-files/application/read-workspace-file-artifact' import { decodeFileVisual } from '@/lib/workspace-files/decode-file-visual' diff --git a/apps/sim/lib/mothership/agent-cli/engines/observe-private-file.ts b/apps/sim/lib/mothership/agent-cli/engines/observe-private-file.ts index 1c88f7a57c4..4e2ce13bece 100644 --- a/apps/sim/lib/mothership/agent-cli/engines/observe-private-file.ts +++ b/apps/sim/lib/mothership/agent-cli/engines/observe-private-file.ts @@ -2,7 +2,7 @@ import { ContentRefusedError, redactBeforeCutting } from '@/lib/core/application import { OrchestrationError } from '@/lib/core/orchestration/types' import type { AgentCliFlags } from '@/lib/mothership/agent-cli/types' import { agentCliOk } from '@/lib/mothership/agent-cli/types' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { parseFileText } from '@/lib/workspace-files/application/read-workspace-file-text' import { decodeFileVisual } from '@/lib/workspace-files/decode-file-visual' import { workspaceFileTextFormat } from '@/lib/workspace-files/text-format' diff --git a/apps/sim/lib/mothership/agent-cli/engines/workflow-tools.ts b/apps/sim/lib/mothership/agent-cli/engines/workflow-tools.ts index 7545d86d4b5..a9d3dc31e39 100644 --- a/apps/sim/lib/mothership/agent-cli/engines/workflow-tools.ts +++ b/apps/sim/lib/mothership/agent-cli/engines/workflow-tools.ts @@ -1,6 +1,6 @@ import { enginePrincipal } from '@/lib/mothership/agent-cli/engine-principal' import { type AgentCliEngine, agentCliFail, agentCliOk } from '@/lib/mothership/agent-cli/types' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { inspectWorkflowTools } from '@/lib/workflows/application/inspect-workflow-tools' export const workflowToolsCommand: AgentCliEngine = { diff --git a/apps/sim/lib/mothership/agent-cli/file-provenance.test.ts b/apps/sim/lib/mothership/agent-cli/file-provenance.test.ts index ea3e9c6b0c7..6fee8cbd8ed 100644 --- a/apps/sim/lib/mothership/agent-cli/file-provenance.test.ts +++ b/apps/sim/lib/mothership/agent-cli/file-provenance.test.ts @@ -24,7 +24,7 @@ const hoisted = vi.hoisted(() => ({ render: vi.fn(), })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) vi.mock('@/lib/file-parsers', () => fileParsersMock) vi.mock('@/lib/core/security/encryption', () => encryptionMock) diff --git a/apps/sim/lib/mothership/agent-cli/file-round-trip-provenance.test.ts b/apps/sim/lib/mothership/agent-cli/file-round-trip-provenance.test.ts index 607fb400d3c..885a539382c 100644 --- a/apps/sim/lib/mothership/agent-cli/file-round-trip-provenance.test.ts +++ b/apps/sim/lib/mothership/agent-cli/file-round-trip-provenance.test.ts @@ -53,14 +53,11 @@ vi.mock('@/lib/projects/membership', () => projectMembershipMock) vi.mock('@/lib/billing/storage', () => billingStorageMock) vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox', () => ({ enqueueWorkspaceFileStorageCleanup: vi.fn(), processWorkspaceFileStorageCleanupNow: vi.fn(), })) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) vi.mock('@/lib/folders/locks', () => ({ acquireFolderMutationLock: vi.fn() })) vi.mock('@/lib/users/queries', () => usersQueriesMock) vi.mock('@/lib/auth/ban', () => authBanMock) @@ -79,8 +76,8 @@ import { executeSimCli } from '@/lib/mothership/tools/handlers/sim-cli' import { getWorkspaceFile, registerUploadedWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' const mocks = { diff --git a/apps/sim/lib/mothership/agent-cli/file-upload-transport.ts b/apps/sim/lib/mothership/agent-cli/file-upload-transport.ts index f90a3fe0897..37da7c6a4e6 100644 --- a/apps/sim/lib/mothership/agent-cli/file-upload-transport.ts +++ b/apps/sim/lib/mothership/agent-cli/file-upload-transport.ts @@ -16,7 +16,7 @@ import { type CopilotChatDelegationContext, createCopilotChatPrincipal, } from '@/lib/mothership/auth/application-delegation' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { completeWorkspaceFileUploadOperation, createWorkspaceFileUploadOperation, diff --git a/apps/sim/lib/mothership/agent-cli/read-only.ts b/apps/sim/lib/mothership/agent-cli/read-only.ts index 060220e6540..88ab42992fe 100644 --- a/apps/sim/lib/mothership/agent-cli/read-only.ts +++ b/apps/sim/lib/mothership/agent-cli/read-only.ts @@ -3,7 +3,7 @@ import type { BlockState } from '@sim/workflow-types/workflow' import { v2ListSecretsContract, v2SecretSchema } from '@/lib/api/contracts/v2/secrets' import { v2WorkflowGraphSchema } from '@/lib/api/contracts/v2/workflows' import type { AgentCliRequest } from '@/lib/mothership/generated/agent-cli' -import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor' +import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/extractor' const READ_ENGINES = new Set([ 'files read', diff --git a/apps/sim/lib/mothership/agent-cli/run-cli.ts b/apps/sim/lib/mothership/agent-cli/run-cli.ts index d44a161f33b..17cbc1baf43 100644 --- a/apps/sim/lib/mothership/agent-cli/run-cli.ts +++ b/apps/sim/lib/mothership/agent-cli/run-cli.ts @@ -1,6 +1,6 @@ import { type EmbeddedCliIdentity, runEmbeddedCli } from 'sim/embed' import { importDurableSecretProvenance } from '@/lib/execution/durable-secret-provenance' -import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/sandbox-encoding' +import { isBinarySandboxPath } from '@/lib/execution/remote-sandbox/encoding' import type { SessionFileObserver } from '@/lib/execution/remote-sandbox/session-file-observer' import { openSessionFileSnapshot } from '@/lib/execution/remote-sandbox/session-file-snapshot' import { diff --git a/apps/sim/lib/mothership/agent-cli/saved-run-read.live.test.ts b/apps/sim/lib/mothership/agent-cli/saved-run-read.live.test.ts index 57c19ffd4e3..f9588dd395a 100644 --- a/apps/sim/lib/mothership/agent-cli/saved-run-read.live.test.ts +++ b/apps/sim/lib/mothership/agent-cli/saved-run-read.live.test.ts @@ -372,8 +372,8 @@ vi.mock('@/lib/workflows/executor/execution-id-claim', () => ({ vi.mock('@/lib/workflows/executor/human-in-the-loop-manager', () => ({ PauseResumeManager: { processQueuedResumes: async () => {} }, })) -vi.mock('@/lib/public-shares/share-manager', async (importOriginal) => ({ - ...(await importOriginal()), +vi.mock('@/lib/public-shares/manager', async (importOriginal) => ({ + ...(await importOriginal()), getShareForResource: async () => null, })) vi.mock('@/lib/execution/remote-sandbox', async (importOriginal) => ({ @@ -466,7 +466,7 @@ vi.mock('@/lib/realtime/notify', async (importOriginal) => ({ ...(await importOriginal()), mergeEditIntoLiveFileDoc: async () => {}, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox', () => ({ enqueueWorkspaceFileStorageCleanup: async () => {}, processWorkspaceFileStorageCleanupNow: async () => {}, })) diff --git a/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.integration.ts b/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.integration.ts index 2fbc47f2f47..d2b48672a44 100644 --- a/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.integration.ts +++ b/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.integration.ts @@ -14,7 +14,7 @@ import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } import { buildOrgScopeCondition } from '@/lib/audit-logs/query' import { initializeSessionFileProvenance } from '@/lib/execution/remote-sandbox/session-file-provenance' import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' vi.mock('@/lib/core/config/redis', () => redisConfigMock) diff --git a/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.ts b/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.ts index 40f1f7ba4c0..3b382e2bd02 100644 --- a/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.ts +++ b/apps/sim/lib/mothership/agent-cli/workbench-file-provenance.ts @@ -13,7 +13,7 @@ import { import { createWorkspaceFileSecretProvenanceFromRegistry, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { bindWorkspaceFileUploadProvenance, parseWorkspaceFileSecretProvenance, diff --git a/apps/sim/lib/mothership/application/application-adapter.test.ts b/apps/sim/lib/mothership/application/adapter.test.ts similarity index 99% rename from apps/sim/lib/mothership/application/application-adapter.test.ts rename to apps/sim/lib/mothership/application/adapter.test.ts index e96924714a8..a6f032d13cb 100644 --- a/apps/sim/lib/mothership/application/application-adapter.test.ts +++ b/apps/sim/lib/mothership/application/adapter.test.ts @@ -1,7 +1,7 @@ import type { DelegatedPrincipal } from '@sim/auth/principal' import { describe, expect, it, vi } from 'vitest' import { defineWorkspaceOperation, type WorkspaceOperation } from '@/lib/core/application' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { type CopilotDelegationConfiguration, type CopilotResourceScope, diff --git a/apps/sim/lib/mothership/application/application-adapter.ts b/apps/sim/lib/mothership/application/adapter.ts similarity index 100% rename from apps/sim/lib/mothership/application/application-adapter.ts rename to apps/sim/lib/mothership/application/adapter.ts diff --git a/apps/sim/lib/mothership/application/authorize-chat-callback.test.ts b/apps/sim/lib/mothership/application/authorize-chat-callback.test.ts index 2b84d1e20ab..491869effd5 100644 --- a/apps/sim/lib/mothership/application/authorize-chat-callback.test.ts +++ b/apps/sim/lib/mothership/application/authorize-chat-callback.test.ts @@ -15,7 +15,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { AccountBillingDecision, BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { authorizeCopilotChatCallback, @@ -25,14 +25,14 @@ import { const hoisted = vi.hoisted(() => ({ capability: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/permission-groups/capability-assertions', async (importOriginal) => ({ ...(await importOriginal()), assertWorkspaceCapability: hoisted.capability, })) vi.mock('@/lib/mothership/chat/organization-chats', () => mothershipOrganizationChatsMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) const mockCheckAccountBillingBlocks = billingAttributionMockFns.mockCheckAccountBillingBlocks const mockCheckAttributedBillingBlocks = billingAttributionMockFns.mockCheckAttributedBillingBlocks const mocks = { diff --git a/apps/sim/lib/mothership/application/authorize-chat-callback.ts b/apps/sim/lib/mothership/application/authorize-chat-callback.ts index 327a1cabca2..4fd8ccc6a3c 100644 --- a/apps/sim/lib/mothership/application/authorize-chat-callback.ts +++ b/apps/sim/lib/mothership/application/authorize-chat-callback.ts @@ -4,7 +4,7 @@ import { type BillingAttributionSnapshot, checkAccountBillingBlocks, checkAttributedBillingBlocks, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application/authorized-workspace-use-case' import { OrchestrationError } from '@/lib/core/orchestration/types' import { chatOperations } from '@/lib/mothership/application/operations' @@ -18,7 +18,7 @@ import { COPILOT_VALIDATION_PURPOSE, type CopilotValidationPurpose, } from '@/lib/mothership/generated/billing-protocol-v1' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const CALLBACK_AUDIENCE = 'sim:copilot-callback' diff --git a/apps/sim/lib/mothership/application/error.test.ts b/apps/sim/lib/mothership/application/errors.test.ts similarity index 96% rename from apps/sim/lib/mothership/application/error.test.ts rename to apps/sim/lib/mothership/application/errors.test.ts index 1cb1f277743..de9eab7de39 100644 --- a/apps/sim/lib/mothership/application/error.test.ts +++ b/apps/sim/lib/mothership/application/errors.test.ts @@ -3,7 +3,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { COPILOT_APPLICATION_SYSTEM_ERROR_MESSAGE, messageForCopilotApplicationError, -} from '@/lib/mothership/application/error' +} from '@/lib/mothership/application/errors' describe('Copilot application error projection', () => { it('exposes only non-internal application errors', () => { diff --git a/apps/sim/lib/mothership/application/error.ts b/apps/sim/lib/mothership/application/errors.ts similarity index 100% rename from apps/sim/lib/mothership/application/error.ts rename to apps/sim/lib/mothership/application/errors.ts diff --git a/apps/sim/lib/mothership/application/execute-api-key-use-case.ts b/apps/sim/lib/mothership/application/execute-api-key-use-case.ts index cb31c15adae..655f406027e 100644 --- a/apps/sim/lib/mothership/application/execute-api-key-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-api-key-use-case.ts @@ -1,5 +1,5 @@ import { apiKeyOperations } from '@/lib/api-key/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' export const executeCopilotApiKeyUseCase = createCopilotApplicationAdapter({ diff --git a/apps/sim/lib/mothership/application/execute-changelog-use-case.ts b/apps/sim/lib/mothership/application/execute-changelog-use-case.ts index 5067f271006..f6fc5166b7b 100644 --- a/apps/sim/lib/mothership/application/execute-changelog-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-changelog-use-case.ts @@ -1,5 +1,5 @@ import { changelogOperations } from '@/lib/changelog/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' export const executeChangelogUseCase = createCopilotApplicationAdapter({ diff --git a/apps/sim/lib/mothership/application/execute-credential-use-case.ts b/apps/sim/lib/mothership/application/execute-credential-use-case.ts index 719f9b55267..f9b7461fe5b 100644 --- a/apps/sim/lib/mothership/application/execute-credential-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-credential-use-case.ts @@ -1,6 +1,6 @@ import { CREDENTIAL_DELEGATION_AUDIENCE } from '@/lib/credentials/application/authorization' import { credentialOperations } from '@/lib/credentials/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' export const executeCopilotCredentialUseCase = createCopilotApplicationAdapter({ diff --git a/apps/sim/lib/mothership/application/execute-custom-tool-use-case.ts b/apps/sim/lib/mothership/application/execute-custom-tool-use-case.ts index e6a6255cbc0..ae9d2b4c258 100644 --- a/apps/sim/lib/mothership/application/execute-custom-tool-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-custom-tool-use-case.ts @@ -1,6 +1,6 @@ import { customToolDelegationPolicy } from '@/lib/custom-tools/application/authorization' import { customToolOperations } from '@/lib/custom-tools/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' export const executeCopilotCustomToolUseCase = createCopilotApplicationAdapter({ diff --git a/apps/sim/lib/mothership/application/execute-dashboard-use-case.ts b/apps/sim/lib/mothership/application/execute-dashboard-use-case.ts index eb28007816a..731f29fd8f3 100644 --- a/apps/sim/lib/mothership/application/execute-dashboard-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-dashboard-use-case.ts @@ -1,5 +1,5 @@ import { dashboardOperations } from '@/lib/dashboards/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' export const executeDashboardUseCase = createCopilotApplicationAdapter({ diff --git a/apps/sim/lib/mothership/application/execute-file-use-case.ts b/apps/sim/lib/mothership/application/execute-file-use-case.ts index 9aceb7a735e..5ee45be9944 100644 --- a/apps/sim/lib/mothership/application/execute-file-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-file-use-case.ts @@ -1,5 +1,5 @@ import type { OperationUseCase } from '@/lib/core/application' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' import { type CopilotFileDelegationContext, diff --git a/apps/sim/lib/mothership/application/execute-knowledge-use-case.ts b/apps/sim/lib/mothership/application/execute-knowledge-use-case.ts index 9ff7ef62247..501bc76ba09 100644 --- a/apps/sim/lib/mothership/application/execute-knowledge-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-knowledge-use-case.ts @@ -6,8 +6,8 @@ import { type KnowledgeOperation, knowledgeOperations, } from '@/lib/knowledge/application/operations' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { COPILOT_APPLICATION_DELEGATION_TTL_MS, type CopilotExecutionContext, diff --git a/apps/sim/lib/mothership/application/execute-table-use-case.ts b/apps/sim/lib/mothership/application/execute-table-use-case.ts index 5eb78c09b78..84e0125b4ff 100644 --- a/apps/sim/lib/mothership/application/execute-table-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-table-use-case.ts @@ -1,5 +1,5 @@ import type { OperationUseCase } from '@/lib/core/application' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS, createTrustedCopilotPrincipal, diff --git a/apps/sim/lib/mothership/application/execute-workflow-test-use-case.ts b/apps/sim/lib/mothership/application/execute-workflow-test-use-case.ts index b01ac10e03b..29afa83c62a 100644 --- a/apps/sim/lib/mothership/application/execute-workflow-test-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-workflow-test-use-case.ts @@ -1,4 +1,4 @@ -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { COPILOT_APPLICATION_DELEGATION_TTL_MS } from '@/lib/mothership/auth/application-delegation' import { workflowTestOperations } from '@/lib/workflow-tests/application/operations' diff --git a/apps/sim/lib/mothership/application/execute-workflow-use-case.ts b/apps/sim/lib/mothership/application/execute-workflow-use-case.ts index cbc4c530475..ca4650e7f70 100644 --- a/apps/sim/lib/mothership/application/execute-workflow-use-case.ts +++ b/apps/sim/lib/mothership/application/execute-workflow-use-case.ts @@ -1,6 +1,6 @@ import type { OperationUseCase } from '@/lib/core/application' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { COPILOT_APPLICATION_DELEGATION_TTL_MS, type CopilotExecutionContext, diff --git a/apps/sim/lib/mothership/application/workspace-target.test.ts b/apps/sim/lib/mothership/application/workspace-target.test.ts index a796221f5cc..5cb679d8704 100644 --- a/apps/sim/lib/mothership/application/workspace-target.test.ts +++ b/apps/sim/lib/mothership/application/workspace-target.test.ts @@ -6,7 +6,7 @@ vi.mock('@/lib/mothership/chat/application/workspace-target', () => ({ WORKSPACE_TARGET_AUDIENCE: 'sim:workspaces', authorizeChatWorkspaceTarget: { execute: mocks.target }, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/core/application', async (original) => ({ ...(await original()), authorizeWorkspaceOperation: mocks.authorize, diff --git a/apps/sim/lib/mothership/application/workspace-target.ts b/apps/sim/lib/mothership/application/workspace-target.ts index ae3f9fb5520..2af41e4af70 100644 --- a/apps/sim/lib/mothership/application/workspace-target.ts +++ b/apps/sim/lib/mothership/application/workspace-target.ts @@ -9,7 +9,7 @@ import { authorizeChatWorkspaceTarget, WORKSPACE_TARGET_AUDIENCE, } from '@/lib/mothership/chat/application/workspace-target' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface InvocationOwner { userId: string diff --git a/apps/sim/lib/mothership/auth/file-delegation.ts b/apps/sim/lib/mothership/auth/file-delegation.ts index 77fd0bb1824..8143400b037 100644 --- a/apps/sim/lib/mothership/auth/file-delegation.ts +++ b/apps/sim/lib/mothership/auth/file-delegation.ts @@ -1,5 +1,5 @@ import type { DelegatedPrincipal } from '@sim/auth/principal' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { COPILOT_APPLICATION_DELEGATION_TTL_MS, type CopilotExecutionContext, diff --git a/apps/sim/lib/mothership/auth/table-delegation.ts b/apps/sim/lib/mothership/auth/table-delegation.ts index 2e765b10386..83cb8192dc6 100644 --- a/apps/sim/lib/mothership/auth/table-delegation.ts +++ b/apps/sim/lib/mothership/auth/table-delegation.ts @@ -1,4 +1,4 @@ -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { type CopilotExecutionContext, createCopilotChatPrincipal, diff --git a/apps/sim/lib/mothership/chat/application/context.ts b/apps/sim/lib/mothership/chat/application/context.ts index 4241f2b2bf8..c12c348830f 100644 --- a/apps/sim/lib/mothership/chat/application/context.ts +++ b/apps/sim/lib/mothership/chat/application/context.ts @@ -6,7 +6,7 @@ import { getActivelyBannedUserIds } from '@/lib/auth/ban' import type { WorkspaceAuthorizationContext } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { conversationModeSelection } from '@/lib/mothership/chat/intent' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export type ChatOwnerContext = | (WorkspaceAuthorizationContext & { organizationId?: undefined }) diff --git a/apps/sim/lib/mothership/chat/application/create-workspace-chat.ts b/apps/sim/lib/mothership/chat/application/create-workspace-chat.ts index 7d8c0b9756e..4700da048a4 100644 --- a/apps/sim/lib/mothership/chat/application/create-workspace-chat.ts +++ b/apps/sim/lib/mothership/chat/application/create-workspace-chat.ts @@ -8,7 +8,7 @@ import { publishChatStatusChanged } from '@/lib/mothership/chat-status' import { MOTHERSHIP_CHAT_DEFAULT_MODEL } from '@/lib/mothership/constants' import { isPlanModeEnabled } from '@/lib/mothership/feature-flags' import { selectedMemorySpaceForNewChat } from '@/lib/mothership/memory/spaces' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const createWorkspaceChat = defineAuthorizedWorkspaceUseCase({ /** permission-group-exempt: creating an empty private chat preserves the existing workspace membership policy. */ diff --git a/apps/sim/lib/mothership/chat/application/inline-images-scratch.test.ts b/apps/sim/lib/mothership/chat/application/inline-images-scratch.test.ts index 2af5aa4fc45..11c5afbc976 100644 --- a/apps/sim/lib/mothership/chat/application/inline-images-scratch.test.ts +++ b/apps/sim/lib/mothership/chat/application/inline-images-scratch.test.ts @@ -11,7 +11,7 @@ import { beforeEach, expect, it, vi } from 'vitest' const hoisted = vi.hoisted(() => ({ snapshot: vi.fn(), dispose: vi.fn() })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock('@/lib/workspace-files/application/read-workspace-file-artifact', () => ({ readWorkspaceFileArtifact: { execute: vi.fn() }, @@ -31,7 +31,7 @@ vi.mock('@/lib/mothership/agent-cli/workbench-file-provenance', () => ({ vi.mock('@/lib/execution/remote-sandbox', () => remoteSandboxMock) import { materializeStreamImage } from '@/lib/mothership/chat/application/inline-images' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' const mocks = { ...hoisted, upload: storageServiceMockFns.mockUploadFile } workspaceAuthzMockFns.mockResolveEffectiveWorkspacePermission.mockResolvedValue('read') diff --git a/apps/sim/lib/mothership/chat/application/inline-images.test.ts b/apps/sim/lib/mothership/chat/application/inline-images.test.ts index c2bdbd0d6f6..aeb3735ef8a 100644 --- a/apps/sim/lib/mothership/chat/application/inline-images.test.ts +++ b/apps/sim/lib/mothership/chat/application/inline-images.test.ts @@ -26,11 +26,11 @@ const hoisted = vi.hoisted(() => ({ artifact: vi.fn(), })) vi.mock('@/lib/mothership/application/workspace-target', () => mothershipWorkspaceTargetMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock('@/lib/mothership/chat/application/read-sandbox-file', () => ({ readChatSandboxFile: { execute: hoisted.scratch }, diff --git a/apps/sim/lib/mothership/chat/application/inline-images.ts b/apps/sim/lib/mothership/chat/application/inline-images.ts index a65f5cdea6b..2c1dd3f388d 100644 --- a/apps/sim/lib/mothership/chat/application/inline-images.ts +++ b/apps/sim/lib/mothership/chat/application/inline-images.ts @@ -28,8 +28,8 @@ import { storeInlineChatImage, } from '@/lib/mothership/chat/inline-image-storage' import { createRegistryContentGate } from '@/lib/mothership/content-delivery' -import { loadActiveWorkspaceFileContext } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { loadActiveWorkspaceFileContext } from '@/lib/uploads/contexts/workspace/file-manager' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' import { readWorkspaceFileArtifact } from '@/lib/workspace-files/application/read-workspace-file-artifact' import { prepareImageForVision } from '@/lib/workspace-files/prepare-image-for-vision' diff --git a/apps/sim/lib/mothership/chat/application/read-sandbox-file.ts b/apps/sim/lib/mothership/chat/application/read-sandbox-file.ts index 65c89afc53a..f31b9a86c1b 100644 --- a/apps/sim/lib/mothership/chat/application/read-sandbox-file.ts +++ b/apps/sim/lib/mothership/chat/application/read-sandbox-file.ts @@ -9,7 +9,7 @@ import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbe import { defineAuthorizedChatUseCase } from '@/lib/mothership/chat/application/authorized-chat-use-case' import { resolveOwnedChatContext } from '@/lib/mothership/chat/application/context' import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { workspaceFileDelegationPolicy } from '@/lib/workspace-files/application/authorization' /** Absolute scratch paths are explicit; failed workspace reads never select a workbench. */ diff --git a/apps/sim/lib/mothership/chat/application/use-cases.test.ts b/apps/sim/lib/mothership/chat/application/use-cases.test.ts index 8a71204f719..09fcf1d9649 100644 --- a/apps/sim/lib/mothership/chat/application/use-cases.test.ts +++ b/apps/sim/lib/mothership/chat/application/use-cases.test.ts @@ -21,7 +21,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/mothership/chat-status', () => mothershipChatStatusMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) const hoisted = vi.hoisted(() => ({ authorizeWorkspace: vi.fn() })) vi.mock('@/lib/core/application/workspace-authorization', async (importOriginal) => ({ ...(await importOriginal()), diff --git a/apps/sim/lib/mothership/chat/application/use-cases.ts b/apps/sim/lib/mothership/chat/application/use-cases.ts index 45e005d4541..6bcb0554bd4 100644 --- a/apps/sim/lib/mothership/chat/application/use-cases.ts +++ b/apps/sim/lib/mothership/chat/application/use-cases.ts @@ -15,7 +15,7 @@ import { asOrchestrationError, OrchestrationError } from '@/lib/core/orchestrati import { mothershipChatOperations } from '@/lib/mothership/chat/application/operations' import { listMothershipChats } from '@/lib/mothership/chat/list-mothership-chats' import { publishChatStatusChanged } from '@/lib/mothership/chat-status' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const chatDelegationPolicy = { audience: 'sim:settings', diff --git a/apps/sim/lib/mothership/chat/application/workspace-target.ts b/apps/sim/lib/mothership/chat/application/workspace-target.ts index 4699f9eef99..dcaf947d1cb 100644 --- a/apps/sim/lib/mothership/chat/application/workspace-target.ts +++ b/apps/sim/lib/mothership/chat/application/workspace-target.ts @@ -6,7 +6,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { createCopilotChatPrincipal } from '@/lib/mothership/auth/application-delegation' import { defineAuthorizedChatUseCase } from '@/lib/mothership/chat/application/authorized-chat-use-case' import { resolveOwnedChatContext } from '@/lib/mothership/chat/application/context' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const WORKSPACE_TARGET_AUDIENCE = 'sim:workspaces' const targetOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/mothership/chat/assistant-images.ts b/apps/sim/lib/mothership/chat/assistant-images.ts index ff6da023ead..c2121d1d4de 100644 --- a/apps/sim/lib/mothership/chat/assistant-images.ts +++ b/apps/sim/lib/mothership/chat/assistant-images.ts @@ -10,7 +10,7 @@ import { ASSISTANT_IMAGE_MAX_COUNT, ASSISTANT_IMAGE_MAX_TOTAL_BYTES, } from '@/lib/uploads/shared/assistant-images' -import { createFileContent } from '@/lib/uploads/utils/file-utils' +import { createFileContent } from '@/lib/uploads/utils/file' export type AssistantImageContent = AssistantImage diff --git a/apps/sim/lib/mothership/chat/child-failure-transcript.test.ts b/apps/sim/lib/mothership/chat/child-failure-transcript.test.ts index 4157effbdff..933ef76e6ec 100644 --- a/apps/sim/lib/mothership/chat/child-failure-transcript.test.ts +++ b/apps/sim/lib/mothership/chat/child-failure-transcript.test.ts @@ -24,7 +24,7 @@ import { } from '@/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize' import type { ContentBlock } from '@/app/workspace/[workspaceId]/home/types' -vi.mock('@/lib/auth/auth-client', () => authClientMock) +vi.mock('@/lib/auth/client', () => authClientMock) const failure = 'The model reached its output limit before finishing the response.' function event( diff --git a/apps/sim/lib/mothership/chat/display-message.ts b/apps/sim/lib/mothership/chat/display-message.ts index 8ec7ff0685e..4123b436bf1 100644 --- a/apps/sim/lib/mothership/chat/display-message.ts +++ b/apps/sim/lib/mothership/chat/display-message.ts @@ -14,7 +14,7 @@ import { MothershipStreamV1ToolOutcome, } from '@/lib/mothership/generated/mothership-stream-v1' import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools' -import { normalizeToolActivityDescription } from '@/lib/mothership/tools/tool-display' +import { normalizeToolActivityDescription } from '@/lib/mothership/tools/display' import { type ChatContextKind, type ChatMessage, diff --git a/apps/sim/lib/mothership/chat/effective-transcript.ts b/apps/sim/lib/mothership/chat/effective-transcript.ts index 49bb4e16026..36938e9806f 100644 --- a/apps/sim/lib/mothership/chat/effective-transcript.ts +++ b/apps/sim/lib/mothership/chat/effective-transcript.ts @@ -24,7 +24,7 @@ import { CONTEXT_COMPACTION_DISPLAY_TITLE, getToolDisplayTitle, normalizeToolActivityDescription, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' interface StreamSnapshotLike { events: StreamBatchEvent[] diff --git a/apps/sim/lib/mothership/chat/folder-context.ts b/apps/sim/lib/mothership/chat/folder-context.ts index 8596b308628..9ea6a6dac0d 100644 --- a/apps/sim/lib/mothership/chat/folder-context.ts +++ b/apps/sim/lib/mothership/chat/folder-context.ts @@ -8,8 +8,8 @@ import { tableDelegationPolicy } from '@/lib/table/application/authorization' import { listTableFoldersUseCase } from '@/lib/table/application/folders' import { encodeVfsPathSegments } from '@/lib/vfs/path' import { workflowDelegationPolicy } from '@/lib/workflows/application/authorization' -import { listWorkflowFolders } from '@/lib/workflows/application/workflow-folders' -import { resolveWorkspaceFileFolderPathOperation } from '@/lib/workspace-files/application/workspace-file-folders' +import { listWorkflowFolders } from '@/lib/workflows/application/folders' +import { resolveWorkspaceFileFolderPathOperation } from '@/lib/workspace-files/application/folders' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' const logger = createLogger('ChatFolderContext') diff --git a/apps/sim/lib/mothership/chat/fork-chat-files.test.ts b/apps/sim/lib/mothership/chat/fork-chat-files.test.ts index 18bc226ce69..269c362d875 100644 --- a/apps/sim/lib/mothership/chat/fork-chat-files.test.ts +++ b/apps/sim/lib/mothership/chat/fork-chat-files.test.ts @@ -9,9 +9,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const { mockGenerateWorkspaceFileKey: mockGenerateKey } = workspaceFileManagerMockFns const { mockDownloadFile, mockUploadFile } = storageServiceMockFns -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) diff --git a/apps/sim/lib/mothership/chat/fork-chat-files.ts b/apps/sim/lib/mothership/chat/fork-chat-files.ts index 04d6eea22da..fec3727e322 100644 --- a/apps/sim/lib/mothership/chat/fork-chat-files.ts +++ b/apps/sim/lib/mothership/chat/fork-chat-files.ts @@ -5,8 +5,8 @@ import { generateShortId } from '@sim/utils/id' import { and, eq, isNull } from 'drizzle-orm' import { mapWithConcurrency } from '@/lib/core/utils/concurrency' import type { DbOrTx, DbTransaction } from '@/lib/db/types' -import { generateWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { copyWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { generateWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/file-manager' +import { copyWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { downloadFile, uploadFile } from '@/lib/uploads/core/storage-service' import { getWorkspaceFileSize, type StorageContext } from '@/lib/uploads/shared/types' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' diff --git a/apps/sim/lib/mothership/chat/chat-mcp-servers.integration.ts b/apps/sim/lib/mothership/chat/mcp-servers.integration.ts similarity index 100% rename from apps/sim/lib/mothership/chat/chat-mcp-servers.integration.ts rename to apps/sim/lib/mothership/chat/mcp-servers.integration.ts diff --git a/apps/sim/lib/mothership/chat/payload.test.ts b/apps/sim/lib/mothership/chat/payload.test.ts index c40b70a1a26..a4d44446f0f 100644 --- a/apps/sim/lib/mothership/chat/payload.test.ts +++ b/apps/sim/lib/mothership/chat/payload.test.ts @@ -188,7 +188,7 @@ vi.mock('@/tools/params', () => ({ createUserToolSchema: mockCreateUserToolSchema, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/integrations/availability.server', () => integrationsAvailabilityMock) diff --git a/apps/sim/lib/mothership/chat/payload.ts b/apps/sim/lib/mothership/chat/payload.ts index a9fa3db2178..6e43afcdfd9 100644 --- a/apps/sim/lib/mothership/chat/payload.ts +++ b/apps/sim/lib/mothership/chat/payload.ts @@ -42,7 +42,7 @@ import { listOrganizationSecretNames } from '@/lib/organization-secrets/applicat import { capabilityDeniedBy } from '@/lib/permission-groups/capability-assertions' import { getUserPermissionConfigForOrganization } from '@/lib/permission-groups/resolve.server' import { SEARCH_CONNECTORS } from '@/lib/sim-search/connectors' -import { trackChatUpload } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { trackChatUpload } from '@/lib/uploads/contexts/workspace/file-manager' import { deriveHostedApiKeySupport } from '@/tools/hosted-api-key' import { getToolMetadata } from '@/tools/metadata' diff --git a/apps/sim/lib/mothership/chat/persisted-message.test.ts b/apps/sim/lib/mothership/chat/persisted-message.test.ts index b95399e8028..cd59ffe8152 100644 --- a/apps/sim/lib/mothership/chat/persisted-message.test.ts +++ b/apps/sim/lib/mothership/chat/persisted-message.test.ts @@ -4,7 +4,7 @@ import type { PersistedToolState } from '@/lib/api/contracts/copilot-messages' import { toDisplayMessage } from '@/lib/mothership/chat/display-message' import { getLiveAssistantMessageId } from '@/lib/mothership/chat/live-message-id' import type { OrchestratorResult } from '@/lib/mothership/request/types' -import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display' +import { getToolDisplayTitle } from '@/lib/mothership/tools/display' import { resolveMessageCitations } from '@/app/workspace/[workspaceId]/home/components/message-content/resolve-citations' import { buildPersistedAssistantMessage, diff --git a/apps/sim/lib/mothership/chat/persisted-message.ts b/apps/sim/lib/mothership/chat/persisted-message.ts index f988c468808..fbf1a76af8a 100644 --- a/apps/sim/lib/mothership/chat/persisted-message.ts +++ b/apps/sim/lib/mothership/chat/persisted-message.ts @@ -28,8 +28,8 @@ import type { LocalToolCallStatus, OrchestratorResult, } from '@/lib/mothership/request/types' +import { normalizeToolActivityDescription } from '@/lib/mothership/tools/display' import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools' -import { normalizeToolActivityDescription } from '@/lib/mothership/tools/tool-display' import type { BrowserTextSelection, TerminalTextSelection } from '@/stores/panel/types' export interface PersistedFileAttachment { diff --git a/apps/sim/lib/mothership/chat/post.test.ts b/apps/sim/lib/mothership/chat/post.test.ts index ea8aeff3ab0..25da285f890 100644 --- a/apps/sim/lib/mothership/chat/post.test.ts +++ b/apps/sim/lib/mothership/chat/post.test.ts @@ -141,7 +141,7 @@ vi.mock('@/lib/workflows/utils', () => workflowsUtilsMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/knowledge/access/availability', () => knowledgeAvailabilityMock) vi.mock('@/lib/mothership/chat/organization-chats', () => mothershipOrganizationChatsMock) diff --git a/apps/sim/lib/mothership/chat/post.ts b/apps/sim/lib/mothership/chat/post.ts index 46002e9b6ff..82671cb137c 100644 --- a/apps/sim/lib/mothership/chat/post.ts +++ b/apps/sim/lib/mothership/chat/post.ts @@ -19,7 +19,7 @@ import { getSession } from '@/lib/auth' import { resolveBillingAttribution, resolveOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { withWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope' import { type AtomicClaimResult, chatSendIdempotency } from '@/lib/core/idempotency' import { asOrchestrationError, statusForOrchestrationError } from '@/lib/core/orchestration/types' diff --git a/apps/sim/lib/mothership/chat/process-contents.test.ts b/apps/sim/lib/mothership/chat/process-contents.test.ts index aa2a33fa9b4..9ffa9e61917 100644 --- a/apps/sim/lib/mothership/chat/process-contents.test.ts +++ b/apps/sim/lib/mothership/chat/process-contents.test.ts @@ -84,7 +84,7 @@ const { listWorkflowFolders: vi.fn< ( request: Parameters< - typeof import('@/lib/workflows/application/workflow-folders').listWorkflowFolders.execute + typeof import('@/lib/workflows/application/folders').listWorkflowFolders.execute >[0] ) => Promise<{ folders: { id: string; name: string; parentId: string | null }[] }> >(async () => ({ @@ -119,7 +119,7 @@ vi.mock('@/lib/skills/application/use-cases', () => ({ getSkillUseCase: { execute: getSkillUseCase }, })) vi.mock('@/lib/mcp/application/use-cases', () => mcpUseCasesMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspace-files/application/read-workspace-file-metadata', () => ({ readWorkspaceFileMetadata: { execute: readWorkspaceFileMetadata }, })) @@ -133,7 +133,7 @@ vi.mock('@/lib/table/application/tables', () => tableApplicationTablesMock) vi.mock('@/lib/workflows/application/read-workflow', () => ({ readWorkflowMetadata: { execute: readWorkflowMetadata }, })) -vi.mock('@/lib/workflows/application/workflow-folders', () => ({ +vi.mock('@/lib/workflows/application/folders', () => ({ listWorkflowFolders: { execute: listWorkflowFolders }, })) vi.mock('@/lib/table/application/folders', () => ({ @@ -142,7 +142,7 @@ vi.mock('@/lib/table/application/folders', () => ({ vi.mock('@/lib/knowledge/application/folders', () => ({ listKnowledgeFolders: { execute: listKnowledgeFolders }, })) -vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ +vi.mock('@/lib/workspace-files/application/folders', () => ({ resolveWorkspaceFileFolderPathOperation: { execute: resolveFileFolderPath }, })) vi.mock('@/lib/mothership/tools/server/docs/search-docs', () => ({ diff --git a/apps/sim/lib/mothership/chat/upload-context.ts b/apps/sim/lib/mothership/chat/upload-context.ts index c332cc5b315..25e43de327c 100644 --- a/apps/sim/lib/mothership/chat/upload-context.ts +++ b/apps/sim/lib/mothership/chat/upload-context.ts @@ -3,7 +3,7 @@ import { buildArchiveExtractGuidance, isArchiveFileName, resolveEffectiveMimeType, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { encodeVfsSegment } from '@/lib/vfs/path' /** The same chat upload path works for CLI reads, code mounts and image references. */ diff --git a/apps/sim/lib/mothership/content-delivery/dispatch.ts b/apps/sim/lib/mothership/content-delivery/dispatch.ts index 6d8e07335d3..b3cde38d9e2 100644 --- a/apps/sim/lib/mothership/content-delivery/dispatch.ts +++ b/apps/sim/lib/mothership/content-delivery/dispatch.ts @@ -8,7 +8,7 @@ import { import { mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { parseWorkspaceFileSecretProvenance } from '@/lib/uploads/upload-session/workspace-file-provenance' import { v2Error } from '@/app/api/v2/lib/response' diff --git a/apps/sim/lib/mothership/docs/docs-corpus.test.ts b/apps/sim/lib/mothership/docs/corpus.test.ts similarity index 99% rename from apps/sim/lib/mothership/docs/docs-corpus.test.ts rename to apps/sim/lib/mothership/docs/corpus.test.ts index e7d39550ccb..8167818f919 100644 --- a/apps/sim/lib/mothership/docs/docs-corpus.test.ts +++ b/apps/sim/lib/mothership/docs/corpus.test.ts @@ -10,7 +10,7 @@ import { grepDocs, isDocsPath, readDocsPage, -} from '@/lib/mothership/docs/docs-corpus' +} from '@/lib/mothership/docs/corpus' import { DOCS_MANIFEST } from '@/lib/mothership/generated/docs-manifest' const mockSleep = utilsHelpersMockFns.mockSleep diff --git a/apps/sim/lib/mothership/docs/docs-corpus.ts b/apps/sim/lib/mothership/docs/corpus.ts similarity index 99% rename from apps/sim/lib/mothership/docs/docs-corpus.ts rename to apps/sim/lib/mothership/docs/corpus.ts index 7a9954fcb76..5745599ffc7 100644 --- a/apps/sim/lib/mothership/docs/docs-corpus.ts +++ b/apps/sim/lib/mothership/docs/corpus.ts @@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' import { sleep } from '@sim/utils/helpers' import { backoffWithJitter, parseRetryAfter } from '@sim/utils/retry' -import { foldDocsIndexPath } from '@/lib/mothership/docs/docs-path' +import { foldDocsIndexPath } from '@/lib/mothership/docs/path' import { DOCS_MANIFEST } from '@/lib/mothership/generated/docs-manifest' import type { GrepCountEntry, GrepMatch, GrepOptions } from '@/lib/mothership/vfs/operations' import { glob as globPaths, grepReadResult } from '@/lib/mothership/vfs/operations' diff --git a/apps/sim/lib/mothership/docs/docs-path.test.ts b/apps/sim/lib/mothership/docs/path.test.ts similarity index 98% rename from apps/sim/lib/mothership/docs/docs-path.test.ts rename to apps/sim/lib/mothership/docs/path.test.ts index 9872348d323..0079e1cd31a 100644 --- a/apps/sim/lib/mothership/docs/docs-path.test.ts +++ b/apps/sim/lib/mothership/docs/path.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { docsSourceCandidates, foldDocsIndexPath } from '@/lib/mothership/docs/docs-path' +import { docsSourceCandidates, foldDocsIndexPath } from '@/lib/mothership/docs/path' import { DOCS_MANIFEST } from '@/lib/mothership/generated/docs-manifest' describe('foldDocsIndexPath', () => { diff --git a/apps/sim/lib/mothership/docs/docs-path.ts b/apps/sim/lib/mothership/docs/path.ts similarity index 100% rename from apps/sim/lib/mothership/docs/docs-path.ts rename to apps/sim/lib/mothership/docs/path.ts diff --git a/apps/sim/lib/mothership/docs/docs-search.test.ts b/apps/sim/lib/mothership/docs/search.test.ts similarity index 99% rename from apps/sim/lib/mothership/docs/docs-search.test.ts rename to apps/sim/lib/mothership/docs/search.test.ts index ff4589e5aaa..f7d97806698 100644 --- a/apps/sim/lib/mothership/docs/docs-search.test.ts +++ b/apps/sim/lib/mothership/docs/search.test.ts @@ -8,7 +8,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/knowledge/embeddings', () => knowledgeEmbeddingsMock) import { OrchestrationError } from '@/lib/core/orchestration/types' -import { DocsSearchScopeError, searchDocs } from '@/lib/mothership/docs/docs-search' +import { DocsSearchScopeError, searchDocs } from '@/lib/mothership/docs/search' const mockGenerateSearchEmbedding = knowledgeEmbeddingsMockFns.mockGenerateSearchEmbedding const capturedLimit = { value: undefined as number | undefined } diff --git a/apps/sim/lib/mothership/docs/docs-search.ts b/apps/sim/lib/mothership/docs/search.ts similarity index 99% rename from apps/sim/lib/mothership/docs/docs-search.ts rename to apps/sim/lib/mothership/docs/search.ts index 4fad48ebbc1..83d49ba6622 100644 --- a/apps/sim/lib/mothership/docs/docs-search.ts +++ b/apps/sim/lib/mothership/docs/search.ts @@ -12,8 +12,8 @@ import { isDocsDir, isDocsPage, normalizeDocsPath, -} from '@/lib/mothership/docs/docs-corpus' -import { docsSourceCandidates, UNMOUNTED_DOCS_SECTIONS } from '@/lib/mothership/docs/docs-path' +} from '@/lib/mothership/docs/corpus' +import { docsSourceCandidates, UNMOUNTED_DOCS_SECTIONS } from '@/lib/mothership/docs/path' const logger = createLogger('DocsSearch') diff --git a/apps/sim/lib/mothership/inbox/attachments.ts b/apps/sim/lib/mothership/inbox/attachments.ts index 503153aaa36..cc9bb7ad367 100644 --- a/apps/sim/lib/mothership/inbox/attachments.ts +++ b/apps/sim/lib/mothership/inbox/attachments.ts @@ -8,7 +8,7 @@ import type { AgentMailAttachment } from '@/lib/mothership/inbox/types' import { generateWorkspaceFileKey, trackChatUpload, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { deleteFile, uploadFile } from '@/lib/uploads/core/storage-service' import { deleteFileMetadata } from '@/lib/uploads/server/metadata' diff --git a/apps/sim/lib/mothership/inbox/executor.test.ts b/apps/sim/lib/mothership/inbox/executor.test.ts index bc42535ec1e..aac5b503b15 100644 --- a/apps/sim/lib/mothership/inbox/executor.test.ts +++ b/apps/sim/lib/mothership/inbox/executor.test.ts @@ -60,7 +60,7 @@ afterAll(resetEnvFlagsMock) vi.mock('@/lib/auth/ban', () => authBanMock) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/chat/lifecycle', () => mothershipChatLifecycleMock) @@ -100,7 +100,7 @@ vi.mock('@/lib/mothership/inbox/response', () => ({ vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) diff --git a/apps/sim/lib/mothership/inbox/executor.ts b/apps/sim/lib/mothership/inbox/executor.ts index 776a8254aad..ed25d17d42b 100644 --- a/apps/sim/lib/mothership/inbox/executor.ts +++ b/apps/sim/lib/mothership/inbox/executor.ts @@ -4,7 +4,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, eq, isNull, sql } from 'drizzle-orm' import { getActivelyBannedUserIds, isEmailBlocked } from '@/lib/auth/ban' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { resolveOrCreateChat } from '@/lib/mothership/chat/lifecycle' import { persistCopilotChatTurn } from '@/lib/mothership/chat/messages-store' import { diff --git a/apps/sim/lib/mothership/inbox/format.ts b/apps/sim/lib/mothership/inbox/format.ts index 628f12dae9c..c6f5f02bdbf 100644 --- a/apps/sim/lib/mothership/inbox/format.ts +++ b/apps/sim/lib/mothership/inbox/format.ts @@ -1,5 +1,5 @@ import type { AgentMailAttachment, InboxTask } from '@/lib/mothership/inbox/types' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' const FORWARDED_PATTERNS = [ /^fwd?:/i, diff --git a/apps/sim/lib/mothership/integrations/application/catalog.test.ts b/apps/sim/lib/mothership/integrations/application/catalog.test.ts index 1d0f7698da9..78ef337b5c8 100644 --- a/apps/sim/lib/mothership/integrations/application/catalog.test.ts +++ b/apps/sim/lib/mothership/integrations/application/catalog.test.ts @@ -44,7 +44,7 @@ vi.mock('@/lib/mcp/application/use-cases', () => mcpUseCasesMock) vi.mock('@/lib/mothership/chat/payload', () => mothershipChatPayloadMock) vi.mock('@/lib/mothership/mcp-tools', () => ({ buildTaggedMcpToolSchemas: hoisted.mcp })) vi.mock('@/lib/mothership/application/workspace-target', () => mothershipWorkspaceTargetMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/auth/ban', () => authBanMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) vi.mock('@/lib/mothership/feature-flags', () => ({ isSearchIntegrationToolsEnabled: hoisted.flag })) diff --git a/apps/sim/lib/mothership/integrations/application/catalog.ts b/apps/sim/lib/mothership/integrations/application/catalog.ts index ab3022c379e..491c86a6407 100644 --- a/apps/sim/lib/mothership/integrations/application/catalog.ts +++ b/apps/sim/lib/mothership/integrations/application/catalog.ts @@ -31,7 +31,7 @@ import type { IntegrationCatalogResponse, } from '@/lib/mothership/generated/integration-catalog' import { buildTaggedMcpToolSchemas } from '@/lib/mothership/mcp-tools' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const INTEGRATION_CATALOG_AUDIENCE = 'sim:integration-catalog' export const readIntegrationCatalogOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/mothership/request/application/controls.ts b/apps/sim/lib/mothership/request/application/controls.ts index 4b61622fa1e..d09d3010092 100644 --- a/apps/sim/lib/mothership/request/application/controls.ts +++ b/apps/sim/lib/mothership/request/application/controls.ts @@ -28,7 +28,7 @@ import { import { requestExplicitStreamAbort } from '@/lib/mothership/request/session/explicit-abort' import { requestStreamSteering } from '@/lib/mothership/request/session/steer' import { recoverSandboxProcesses } from '@/lib/mothership/request/tools/sandbox-recovery' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('MothershipRunControls') const policy = { diff --git a/apps/sim/lib/mothership/request/application/recover-stream.test.ts b/apps/sim/lib/mothership/request/application/recover-stream.test.ts index 7b0d466bd35..f375c9b5ca6 100644 --- a/apps/sim/lib/mothership/request/application/recover-stream.test.ts +++ b/apps/sim/lib/mothership/request/application/recover-stream.test.ts @@ -51,7 +51,7 @@ vi.mock('@/lib/mothership/request/session/buffer', () => ({ readEvents: hoisted.events, getLatestSeq: async () => null, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) const mockResolveBillingAttribution = billingAttributionMockFns.mockResolveBillingAttribution const mockResolveOrganizationBillingAttribution = billingAttributionMockFns.mockResolveOrganizationBillingAttribution diff --git a/apps/sim/lib/mothership/request/application/recover-stream.ts b/apps/sim/lib/mothership/request/application/recover-stream.ts index a13c63715fe..0fd115575b0 100644 --- a/apps/sim/lib/mothership/request/application/recover-stream.ts +++ b/apps/sim/lib/mothership/request/application/recover-stream.ts @@ -5,7 +5,7 @@ import { generateId } from '@sim/utils/id' import { resolveBillingAttribution, resolveOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { defineWorkspaceOperation } from '@/lib/core/application' import { defineOrganizationOperation } from '@/lib/core/application/organization-operation' import { isHosted } from '@/lib/core/config/env-flags' diff --git a/apps/sim/lib/mothership/request/go/file-preview-adapter.test.ts b/apps/sim/lib/mothership/request/go/file-preview-adapter.test.ts index 7e416b15e78..090ad17dcf3 100644 --- a/apps/sim/lib/mothership/request/go/file-preview-adapter.test.ts +++ b/apps/sim/lib/mothership/request/go/file-preview-adapter.test.ts @@ -12,7 +12,7 @@ const { peekFileIntentMock, executeCopilotFileUseCaseMock } = vi.hoisted(() => ( executeCopilotFileUseCaseMock: vi.fn(), })) -vi.mock('@/lib/mothership/tools/server/files/file-intent-store', () => ({ +vi.mock('@/lib/mothership/tools/server/files/intent-store', () => ({ peekFileIntent: peekFileIntentMock, })) diff --git a/apps/sim/lib/mothership/request/go/file-preview-adapter.ts b/apps/sim/lib/mothership/request/go/file-preview-adapter.ts index 94fac8cc557..03a3a1ec652 100644 --- a/apps/sim/lib/mothership/request/go/file-preview-adapter.ts +++ b/apps/sim/lib/mothership/request/go/file-preview-adapter.ts @@ -23,13 +23,13 @@ import type { StreamingContext, } from '@/lib/mothership/request/types' import { findNonTabFileIds } from '@/lib/mothership/resources/file-tabs' -import { peekFileIntent } from '@/lib/mothership/tools/server/files/file-intent-store' +import { peekFileIntent } from '@/lib/mothership/tools/server/files/intent-store' import { buildFilePreviewText, loadWorkspaceFileTextForPreview, type WorkspaceFilePreviewBase, -} from '@/lib/mothership/tools/server/files/file-preview' -import { resolveWorkspaceFileReference } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/mothership/tools/server/files/preview' +import { resolveWorkspaceFileReference } from '@/lib/uploads/contexts/workspace/file-manager' import { findActiveWorkspaceFilesByReference } from '@/lib/workspace-files/application/list-workspace-files' const logger = createLogger('CopilotFilePreviewAdapter') diff --git a/apps/sim/lib/mothership/request/go/stream.test.ts b/apps/sim/lib/mothership/request/go/stream.test.ts index d1742ed5294..48431df2ca3 100644 --- a/apps/sim/lib/mothership/request/go/stream.test.ts +++ b/apps/sim/lib/mothership/request/go/stream.test.ts @@ -44,7 +44,7 @@ vi.mock('@/lib/mothership/resources/store', () => ({ changeStoredChatResources: changeStoredChatResourcesMock, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspace-files/application/list-workspace-files', () => workspaceFilesListMock) vi.mock('@/lib/mothership/application/execute-file-use-case', () => ({ @@ -65,10 +65,10 @@ vi.mock('@/lib/mothership/application/execute-file-use-case', () => ({ }), })) -vi.mock('@/lib/mothership/tools/server/files/file-preview', async () => { +vi.mock('@/lib/mothership/tools/server/files/preview', async () => { const actual = await vi.importActual< - typeof import('@/lib/mothership/tools/server/files/file-preview') - >('@/lib/mothership/tools/server/files/file-preview') + typeof import('@/lib/mothership/tools/server/files/preview') + >('@/lib/mothership/tools/server/files/preview') return { ...actual, // Returns the file's preview base as a `WorkspaceFilePreviewBase` ({ text }), NOT a bare string — diff --git a/apps/sim/lib/mothership/request/handlers/tool.ts b/apps/sim/lib/mothership/request/handlers/tool.ts index 61d6d2b7281..6f9e3757af3 100644 --- a/apps/sim/lib/mothership/request/handlers/tool.ts +++ b/apps/sim/lib/mothership/request/handlers/tool.ts @@ -49,20 +49,20 @@ import type { ToolCallState, } from '@/lib/mothership/request/types' import { getToolEntry, isSimExecuted } from '@/lib/mothership/tool-executor' +import { readToolActivity } from '@/lib/mothership/tools/activity' import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools' import { isWorkflowToolName } from '@/lib/mothership/tools/client-executed-tools' import { isBackgroundDesktopToolCall, isClaimedOnPickup, } from '@/lib/mothership/tools/desktop-tools' -import { isUserLocalVfsToolCall } from '@/lib/mothership/tools/local-filesystem' -import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' -import { readToolActivity } from '@/lib/mothership/tools/tool-activity' import { getToolDisplayTitle, normalizeToolActivityDescription, refineStreamingCliToolName, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' +import { isUserLocalVfsToolCall } from '@/lib/mothership/tools/local-filesystem' +import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args' import { resolveWorkflowToolTargetId } from '@/lib/mothership/tools/workflow-tools' import { getBlockByToolName } from '@/blocks/registry' import { diff --git a/apps/sim/lib/mothership/request/headers.ts b/apps/sim/lib/mothership/request/headers.ts index 008564b8e8f..f043d090d27 100644 --- a/apps/sim/lib/mothership/request/headers.ts +++ b/apps/sim/lib/mothership/request/headers.ts @@ -1,4 +1,4 @@ -import type { AttributedBillingRequestEnvelope } from '@/lib/billing/core/billing-attribution' +import type { AttributedBillingRequestEnvelope } from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { SIM_AGENT_VERSION } from '@/lib/mothership/constants' import { getMothershipSourceEnvHeaders } from '@/lib/mothership/server/agent-url' diff --git a/apps/sim/lib/mothership/request/lifecycle/admission.test.ts b/apps/sim/lib/mothership/request/lifecycle/admission.test.ts index d49e468b854..53ea16e46ab 100644 --- a/apps/sim/lib/mothership/request/lifecycle/admission.test.ts +++ b/apps/sim/lib/mothership/request/lifecycle/admission.test.ts @@ -5,7 +5,7 @@ import { billingUsageGateCacheMockFns, } from '@sim/testing/mocks/billing-usage-gate-cache.mock' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { createAttributedBillingRequestEnvelope } from '@/lib/billing/core/billing-attribution' +import { createAttributedBillingRequestEnvelope } from '@/lib/billing/core/attribution' import { resetMidRunUsageCaches } from '@/lib/billing/core/mid-run-usage' import { OrchestrationError } from '@/lib/core/orchestration/types' import { BillingLimitError } from '@/lib/mothership/request/go/stream' diff --git a/apps/sim/lib/mothership/request/lifecycle/admission.ts b/apps/sim/lib/mothership/request/lifecycle/admission.ts index efdcba71e38..13301cc36c2 100644 --- a/apps/sim/lib/mothership/request/lifecycle/admission.ts +++ b/apps/sim/lib/mothership/request/lifecycle/admission.ts @@ -5,7 +5,7 @@ import { COPILOT_BILLING_PROTOCOL, COPILOT_BILLING_PROTOCOL_HEADER, requireBillingCallbackAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { readMidRunUsageVerdict } from '@/lib/billing/core/mid-run-usage' import { isHosted } from '@/lib/core/config/env-flags' import { OrchestrationError } from '@/lib/core/orchestration/types' diff --git a/apps/sim/lib/mothership/request/lifecycle/run.test.ts b/apps/sim/lib/mothership/request/lifecycle/run.test.ts index 0339239cc76..4a7640c1071 100644 --- a/apps/sim/lib/mothership/request/lifecycle/run.test.ts +++ b/apps/sim/lib/mothership/request/lifecycle/run.test.ts @@ -83,7 +83,7 @@ vi.mock('@/lib/mothership/application/load-search-integrations', () => ({ vi.mock('@/lib/mothership/request/context/restore', () => ({ restoreStreamingContext: vi.fn() })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) @@ -175,8 +175,8 @@ vi.mock('@/lib/mothership/tools/handlers/context', () => ({ prepareExecutionContext: mockPrepareExecutionContext, })) -vi.mock('@/lib/billing/core/billing-attribution', async (original) => ({ - ...(await original()), +vi.mock('@/lib/billing/core/attribution', async (original) => ({ + ...(await original()), /** * Faithful envelope replica: real protocol constant, real UUID request id, real * URI-encoded serialization — the hosted-header tests below assert all three. diff --git a/apps/sim/lib/mothership/request/lifecycle/run.ts b/apps/sim/lib/mothership/request/lifecycle/run.ts index dd3d6e47e26..923b4053747 100644 --- a/apps/sim/lib/mothership/request/lifecycle/run.ts +++ b/apps/sim/lib/mothership/request/lifecycle/run.ts @@ -13,7 +13,7 @@ import { type BillingAttributionSnapshot, checkAttributedUsageLimits, createAttributedBillingRequestEnvelope, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { env } from '@/lib/core/config/env' import { isCopilotToolPermissionsEnabled, isHosted } from '@/lib/core/config/env-flags' import { SIM_TOOL_EXECUTION_LEASE_SECONDS } from '@/lib/mothership/async-runs/execution-lease' @@ -89,7 +89,7 @@ import { getMothershipBaseURL } from '@/lib/mothership/server/agent-url' import { prepareExecutionContext } from '@/lib/mothership/tools/handlers/context' import { getSimConnection } from '@/lib/mothership/transport/connection' import { isWorkspaceCapabilityWithheld } from '@/lib/permission-groups/capability-assertions' -import { filterModelSafeWorkspaceFileAttachments } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { filterModelSafeWorkspaceFileAttachments } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { appendUnavailableAttachmentNotice } from '@/lib/uploads/utils/model-input' import type { ExecutorDelegationOrigin } from '@/executor/types' import { refuseResolvedSecretProjection } from '@/executor/utils/resolved-secret-projection-refusal' diff --git a/apps/sim/lib/mothership/request/lifecycle/start.test.ts b/apps/sim/lib/mothership/request/lifecycle/start.test.ts index dcc2c6937d3..0510aaa6fdc 100644 --- a/apps/sim/lib/mothership/request/lifecycle/start.test.ts +++ b/apps/sim/lib/mothership/request/lifecycle/start.test.ts @@ -83,7 +83,7 @@ vi.mock('@/lib/mothership/request/session/controller-lease', async (original) => holdsChatStreamLease: vi.fn().mockResolvedValue(true), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/chat/title-context', () => ({ buildChatTitleContext })) diff --git a/apps/sim/lib/mothership/request/lifecycle/start.ts b/apps/sim/lib/mothership/request/lifecycle/start.ts index 9db811b9f7b..d8aa60e17f8 100644 --- a/apps/sim/lib/mothership/request/lifecycle/start.ts +++ b/apps/sim/lib/mothership/request/lifecycle/start.ts @@ -11,7 +11,7 @@ import { createAttributedBillingRequestEnvelope, resolveBillingAttribution, resolveOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { isHosted } from '@/lib/core/config/env-flags' import { createRunSegment, recordRunBillingAdmission } from '@/lib/mothership/async-runs/repository' import { buildChatTitleContext } from '@/lib/mothership/chat/title-context' diff --git a/apps/sim/lib/mothership/request/session/replay-budget.integration.ts b/apps/sim/lib/mothership/request/session/replay-budget.integration.ts index 8735d6b78aa..8c530c1aa5c 100644 --- a/apps/sim/lib/mothership/request/session/replay-budget.integration.ts +++ b/apps/sim/lib/mothership/request/session/replay-budget.integration.ts @@ -170,7 +170,7 @@ import type { StreamingContext } from '@/lib/mothership/request/types' import { type PendingFileIntent, storeFileIntent, -} from '@/lib/mothership/tools/server/files/file-intent-store' +} from '@/lib/mothership/tools/server/files/intent-store' import { GET as copilotChatGET } from '@/app/api/copilot/chat/queries' import { GET as streamGET } from '@/app/api/copilot/chat/stream/route' import { GET as mothershipChatGET } from '@/app/api/mothership/chats/[chatId]/route' diff --git a/apps/sim/lib/mothership/request/session/replay-compaction.ts b/apps/sim/lib/mothership/request/session/replay-compaction.ts index feef020c9da..be121a1dbed 100644 --- a/apps/sim/lib/mothership/request/session/replay-compaction.ts +++ b/apps/sim/lib/mothership/request/session/replay-compaction.ts @@ -6,7 +6,7 @@ import { } from '@/lib/mothership/generated/mothership-stream-v1' import type { StreamEvent } from '@/lib/mothership/request/session/types' import { isClientExecutedToolCall } from '@/lib/mothership/tools/client-executed-tools' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' /** * Payloads whose strings could serialize past this are compacted before they are diff --git a/apps/sim/lib/mothership/request/tools/execution-lifetime.test.ts b/apps/sim/lib/mothership/request/tools/execution-lifetime.test.ts index 27a420de7e0..5dbc3bb06dd 100644 --- a/apps/sim/lib/mothership/request/tools/execution-lifetime.test.ts +++ b/apps/sim/lib/mothership/request/tools/execution-lifetime.test.ts @@ -8,7 +8,7 @@ import { recordSandboxProcess, reportUnsettledSandboxProcess, settleSandboxProcess, -} from '@/lib/execution/remote-sandbox/execution-observer' +} from '@/lib/execution/remote-sandbox/observer' const { recover } = vi.hoisted(() => ({ recover: vi.fn() })) vi.mock('@/lib/mothership/async-runs/repository', () => mothershipAsyncRunsMock) diff --git a/apps/sim/lib/mothership/request/tools/execution-lifetime.ts b/apps/sim/lib/mothership/request/tools/execution-lifetime.ts index 1e58171c472..f00f3eb197f 100644 --- a/apps/sim/lib/mothership/request/tools/execution-lifetime.ts +++ b/apps/sim/lib/mothership/request/tools/execution-lifetime.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' -import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/observer' import { SIM_TOOL_EXECUTION_HEARTBEAT_MS, SimToolExecutionLeaseLostError, diff --git a/apps/sim/lib/mothership/request/tools/files.ts b/apps/sim/lib/mothership/request/tools/files.ts index f3b2b9f8136..e5ac3643a80 100644 --- a/apps/sim/lib/mothership/request/tools/files.ts +++ b/apps/sim/lib/mothership/request/tools/files.ts @@ -16,7 +16,7 @@ import { createWorkspaceFileSecretProvenanceFromRegistry, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceRepresentation, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { decodeVfsPathSegments } from '@/lib/vfs/path' import type { ResolvedSecretMatcher } from '@/executor/utils/resolved-secret-matcher' import { diff --git a/apps/sim/lib/mothership/request/tools/workflow-context.test.ts b/apps/sim/lib/mothership/request/tools/workflow-context.test.ts index 9dc6114f56d..097fc1a764d 100644 --- a/apps/sim/lib/mothership/request/tools/workflow-context.test.ts +++ b/apps/sim/lib/mothership/request/tools/workflow-context.test.ts @@ -11,10 +11,10 @@ import { billingUsageReservationMockFns, } from '@sim/testing/mocks/billing-usage-reservation.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { ADMISSION_ERROR_CODE } from '@/lib/core/admission/transient-failure' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) const resolveBillingAttributionMock = billingAttributionMockFns.mockResolveBillingAttribution vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) const checkAttributedUsageLimitsMock = billingUsageGateCacheMockFns.mockCheckExecutionUsageLimits diff --git a/apps/sim/lib/mothership/tasks/application/tasks.test.ts b/apps/sim/lib/mothership/tasks/application/tasks.test.ts index d963414b735..8cb00342f96 100644 --- a/apps/sim/lib/mothership/tasks/application/tasks.test.ts +++ b/apps/sim/lib/mothership/tasks/application/tasks.test.ts @@ -40,7 +40,7 @@ vi.mock('@/lib/core/application/workspace-authorization', async (original) => ({ ...(await original()), authorizeWorkspaceOperation: hoisted.authorize, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@/lib/workflows/executor/execution-status', () => ({ getWorkflowExecutionStatus: hoisted.status, diff --git a/apps/sim/lib/mothership/tasks/wake.test.ts b/apps/sim/lib/mothership/tasks/wake.test.ts index 16267744cb8..28d3892b086 100644 --- a/apps/sim/lib/mothership/tasks/wake.test.ts +++ b/apps/sim/lib/mothership/tasks/wake.test.ts @@ -31,7 +31,7 @@ const { mockAcquirePendingChatStream, mockReleasePendingChatStream, mockAuthoriz vi.mock('@/lib/mothership/tasks/application/prepare-wake', () => ({ authorizeTaskWake: mockAuthorizeTaskWake, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/mothership/chat/messages-store', () => mothershipChatMessagesMock) vi.mock('@/lib/mothership/chat/payload', () => mothershipChatPayloadMock) vi.mock('@/lib/mothership/chat-status', () => mothershipChatStatusMock) diff --git a/apps/sim/lib/mothership/tasks/wake.ts b/apps/sim/lib/mothership/tasks/wake.ts index 63f7614bdb2..23ef4c22d9e 100644 --- a/apps/sim/lib/mothership/tasks/wake.ts +++ b/apps/sim/lib/mothership/tasks/wake.ts @@ -11,7 +11,7 @@ import { getErrorMessage } from '@sim/utils/errors' import { resolveBillingAttribution, resolveOrganizationBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { createTrustedCopilotPrincipal, createTrustedOrganizationCopilotPrincipal, diff --git a/apps/sim/lib/mothership/tool-executor/types.ts b/apps/sim/lib/mothership/tool-executor/types.ts index 3f048f500c3..e3270a53134 100644 --- a/apps/sim/lib/mothership/tool-executor/types.ts +++ b/apps/sim/lib/mothership/tool-executor/types.ts @@ -1,4 +1,4 @@ -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { WorkspaceSearchFilters } from '@/lib/knowledge/search/filters' import type { MothershipResourceUpdate } from '@/lib/mothership/resources/types' import type { SecretMountPolicy } from '@/lib/mothership/secret-mount-policy' diff --git a/apps/sim/lib/mothership/tools/tool-activity.test.ts b/apps/sim/lib/mothership/tools/activity.test.ts similarity index 96% rename from apps/sim/lib/mothership/tools/tool-activity.test.ts rename to apps/sim/lib/mothership/tools/activity.test.ts index ed4db40b26a..2b7b4afba80 100644 --- a/apps/sim/lib/mothership/tools/tool-activity.test.ts +++ b/apps/sim/lib/mothership/tools/activity.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { readToolActivity } from '@/lib/mothership/tools/tool-activity' +import { readToolActivity } from '@/lib/mothership/tools/activity' describe('activity argument streaming', () => { const activity = { diff --git a/apps/sim/lib/mothership/tools/tool-activity.ts b/apps/sim/lib/mothership/tools/activity.ts similarity index 99% rename from apps/sim/lib/mothership/tools/tool-activity.ts rename to apps/sim/lib/mothership/tools/activity.ts index 6bd57b10ba1..f2c5ba7fa30 100644 --- a/apps/sim/lib/mothership/tools/tool-activity.ts +++ b/apps/sim/lib/mothership/tools/activity.ts @@ -5,7 +5,7 @@ import { getToolCompletedTitle, getToolDisplayTitle, getToolStatusDisplayTitle, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' /** One provider-independent activity shape for both parsed and still-streaming calls. */ export function readToolActivity( diff --git a/apps/sim/lib/mothership/tools/cli-tool-display.ts b/apps/sim/lib/mothership/tools/cli-tool-display.ts index 6abe3adc646..4b7aca0c4e7 100644 --- a/apps/sim/lib/mothership/tools/cli-tool-display.ts +++ b/apps/sim/lib/mothership/tools/cli-tool-display.ts @@ -4,7 +4,7 @@ * (`cli_`). * * Generated from the sim CLI command inventory; present-participle titles so - * the standard completed/failed tense projection in `tool-display.ts` applies. + * the standard completed/failed tense projection in `tools/display.ts` applies. * Regenerate when the CLI command surface changes. */ export const CLI_TOOL_TITLES: Record = { diff --git a/apps/sim/lib/mothership/tools/client/resource-display.ts b/apps/sim/lib/mothership/tools/client/resource-display.ts index 4b04e09bd17..71a85258c41 100644 --- a/apps/sim/lib/mothership/tools/client/resource-display.ts +++ b/apps/sim/lib/mothership/tools/client/resource-display.ts @@ -7,7 +7,7 @@ import { cliFlagValue, cliFlagValues, getToolDisplayTitle, -} from '@/lib/mothership/tools/tool-display' +} from '@/lib/mothership/tools/display' import { getQueryClient } from '@/app/_shell/providers/get-query-client' import { getBlock } from '@/blocks/registry' import { skillsKeys } from '@/hooks/queries/skills' diff --git a/apps/sim/lib/mothership/tools/client/run-tool-execution.test.ts b/apps/sim/lib/mothership/tools/client/run-tool-execution.test.ts index aa43f04fb1f..523e8d63168 100644 --- a/apps/sim/lib/mothership/tools/client/run-tool-execution.test.ts +++ b/apps/sim/lib/mothership/tools/client/run-tool-execution.test.ts @@ -15,7 +15,7 @@ import { import { sleep } from '@sim/utils/helpers' import { beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest' import { getWorkflowExecutionContract } from '@/lib/api/contracts/workflows' -import type { WorkflowExecutionOptions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils' +import type { WorkflowExecutionOptions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution' import { useExecutionStore } from '@/stores/execution/store' const { @@ -69,7 +69,7 @@ vi.mock('@sim/utils/retry', () => ({ })) vi.mock('@/lib/api/client/request', () => apiClientRequestMock) -vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils', () => ({ +vi.mock('@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution', () => ({ executeWorkflowWithFullLogging, })) diff --git a/apps/sim/lib/mothership/tools/client/run-tool-execution.ts b/apps/sim/lib/mothership/tools/client/run-tool-execution.ts index 5b29355dc99..c1a2aea59ed 100644 --- a/apps/sim/lib/mothership/tools/client/run-tool-execution.ts +++ b/apps/sim/lib/mothership/tools/client/run-tool-execution.ts @@ -35,7 +35,7 @@ import { WORKFLOW_EXECUTION_BUSY, type WorkflowToolLaunchError, } from '@/lib/mothership/tools/workflow-tools' -import { executeWorkflowWithFullLogging } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils' +import { executeWorkflowWithFullLogging } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution' import { isExecutionStreamHttpError, isReconnectStreamOpen, diff --git a/apps/sim/lib/mothership/tools/client/store-utils.ts b/apps/sim/lib/mothership/tools/client/store-utils.ts index e307dbfdda5..97e8197c52a 100644 --- a/apps/sim/lib/mothership/tools/client/store-utils.ts +++ b/apps/sim/lib/mothership/tools/client/store-utils.ts @@ -6,7 +6,7 @@ import { VFS_DIR_TO_RESOURCE } from '@/lib/mothership/resources/types' import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools' import { getReadTargetBlock } from '@/lib/mothership/tools/client/read-block' import { ClientToolCallState } from '@/lib/mothership/tools/client/tool-call-state' -import { humanizeDisplayIdentifier, humanizeToolName } from '@/lib/mothership/tools/tool-display' +import { humanizeDisplayIdentifier, humanizeToolName } from '@/lib/mothership/tools/display' import { decodeVfsSegmentSafe } from '@/lib/vfs/path' /** Respond tools are internal handoff tools shown with a friendly generic label. */ diff --git a/apps/sim/lib/mothership/tools/tool-display.ts b/apps/sim/lib/mothership/tools/display.ts similarity index 100% rename from apps/sim/lib/mothership/tools/tool-display.ts rename to apps/sim/lib/mothership/tools/display.ts diff --git a/apps/sim/lib/mothership/tools/handlers/connect-slack-bot.ts b/apps/sim/lib/mothership/tools/handlers/connect-slack-bot.ts index 19414c14fda..66f6bd058e5 100644 --- a/apps/sim/lib/mothership/tools/handlers/connect-slack-bot.ts +++ b/apps/sim/lib/mothership/tools/handlers/connect-slack-bot.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sim/logger' import { createServiceAccountCredentialUseCase } from '@/lib/credentials/application/service-account' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { executeCopilotCredentialUseCase } from '@/lib/mothership/application/execute-credential-use-case' import { ConnectSlackBotInputSchema } from '@/lib/mothership/generated/protocol' import type { ToolHandler } from '@/lib/mothership/tool-executor/types' diff --git a/apps/sim/lib/mothership/tools/handlers/context.ts b/apps/sim/lib/mothership/tools/handlers/context.ts index b548f8cc49d..721d6705b66 100644 --- a/apps/sim/lib/mothership/tools/handlers/context.ts +++ b/apps/sim/lib/mothership/tools/handlers/context.ts @@ -2,7 +2,7 @@ import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { type CopilotEnvironmentContext, prepareCopilotEnvironmentContext, diff --git a/apps/sim/lib/mothership/tools/handlers/function-execute-file-mounts.test.ts b/apps/sim/lib/mothership/tools/handlers/function-execute-file-mounts.test.ts index 574901baba0..ee5d47f34e2 100644 --- a/apps/sim/lib/mothership/tools/handlers/function-execute-file-mounts.test.ts +++ b/apps/sim/lib/mothership/tools/handlers/function-execute-file-mounts.test.ts @@ -24,7 +24,7 @@ vi.mock('@/lib/mothership/chat/application/read-attachment', () => ({ readChatAttachment: { execute: hoisted.attachment }, })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) vi.mock('@/lib/workspace-files/application/list-workspace-files', () => workspaceFilesListMock) vi.mock('@/lib/workspace-files/application/fetch-servable-workspace-file-buffer', () => ({ @@ -43,7 +43,7 @@ import { executeFunctionExecute, resolveInputFiles, } from '@/lib/mothership/tools/handlers/function-execute' -import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { readWorkspaceFileMount } from '@/lib/workspace-files/application/read-workspace-file-mount' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/mothership/tools/handlers/function-execute-provenance.test.ts b/apps/sim/lib/mothership/tools/handlers/function-execute-provenance.test.ts index 343e8e73374..c90a12f6575 100644 --- a/apps/sim/lib/mothership/tools/handlers/function-execute-provenance.test.ts +++ b/apps/sim/lib/mothership/tools/handlers/function-execute-provenance.test.ts @@ -15,7 +15,7 @@ vi.mock('@/lib/secrets/usage/record', () => ({ recordSecretUsage: vi.fn() })) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) import { encryptSecret } from '@/lib/core/security/encryption' -import { sandboxSessionInputProvenance } from '@/lib/execution/remote-sandbox/execution-observer' +import { sandboxSessionInputProvenance } from '@/lib/execution/remote-sandbox/observer' import { executeFunctionExecute } from '@/lib/mothership/tools/handlers/function-execute' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/mothership/tools/handlers/function-execute-table-mounts.test.ts b/apps/sim/lib/mothership/tools/handlers/function-execute-table-mounts.test.ts index e5be1e94a53..19a460bad5f 100644 --- a/apps/sim/lib/mothership/tools/handlers/function-execute-table-mounts.test.ts +++ b/apps/sim/lib/mothership/tools/handlers/function-execute-table-mounts.test.ts @@ -24,7 +24,7 @@ const hoisted = vi.hoisted(() => ({ vi.mock('@/tools', () => toolsMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/table/service', () => tableServiceMock) vi.mock('@/lib/table', () => tableMock) vi.mock('@/lib/folders/queries', () => folderQueriesMock) diff --git a/apps/sim/lib/mothership/tools/handlers/function-execute.ts b/apps/sim/lib/mothership/tools/handlers/function-execute.ts index 190dca23d55..bd385fa99e8 100644 --- a/apps/sim/lib/mothership/tools/handlers/function-execute.ts +++ b/apps/sim/lib/mothership/tools/handlers/function-execute.ts @@ -14,8 +14,8 @@ import { PRIVATE_SECRET_PROVENANCE_FIELD, } from '@/lib/execution/private-tool-metadata' import { MAX_PLAN_REQUIRED } from '@/lib/execution/remote-sandbox/entitlement' -import { observeSandboxSessionInputs } from '@/lib/execution/remote-sandbox/execution-observer' -import { SANDBOX_INPUT_DIR } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { observeSandboxSessionInputs } from '@/lib/execution/remote-sandbox/observer' +import { SANDBOX_INPUT_DIR } from '@/lib/execution/remote-sandbox/paths' import type { SandboxFile } from '@/lib/execution/remote-sandbox/types' import { collectDescendantFolderIdsFrom, indexFolderChildren } from '@/lib/folders/subtree' import { @@ -53,9 +53,10 @@ import { getSandboxWorkspaceFilePath, parseChatUploadReference, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { decodeVfsPathSegments, encodeVfsPathSegments } from '@/lib/vfs/path' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' +import { listWorkspaceFileFoldersOperation } from '@/lib/workspace-files/application/folders' import { findActiveWorkspaceFilesByReference, queryWorkspaceFilePage, @@ -63,7 +64,6 @@ import { import { fileOperations } from '@/lib/workspace-files/application/operations' import { readWorkspaceFileMount } from '@/lib/workspace-files/application/read-workspace-file-mount' import { resolveWorkspaceFileReference } from '@/lib/workspace-files/application/resolve-workspace-file-reference' -import { listWorkspaceFileFoldersOperation } from '@/lib/workspace-files/application/workspace-file-folders' import { buildWorkspaceFileFolderDisplayPath, parseWorkspaceFileFolderDisplayPath, diff --git a/apps/sim/lib/mothership/tools/handlers/oauth.ts b/apps/sim/lib/mothership/tools/handlers/oauth.ts index d8df214a0db..ef5e526b465 100644 --- a/apps/sim/lib/mothership/tools/handlers/oauth.ts +++ b/apps/sim/lib/mothership/tools/handlers/oauth.ts @@ -3,7 +3,7 @@ import { getBaseUrl } from '@/lib/core/utils/urls' import { prepareCredentialConnection } from '@/lib/credentials/application/prepare-credential-connection' import { prepareOrganizationPersonalConnection } from '@/lib/credentials/application/resolve-organization-personal-token' import { isServiceAccountProviderId } from '@/lib/credentials/service-account-provider-ids' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { executeCopilotCredentialUseCase } from '@/lib/mothership/application/execute-credential-use-case' import { executeCopilotOrganizationCredentialUseCase } from '@/lib/mothership/application/resolve-organization-personal-token' import type { diff --git a/apps/sim/lib/mothership/tools/handlers/sim-cli.ts b/apps/sim/lib/mothership/tools/handlers/sim-cli.ts index 8d60e184b3b..0faa098d88a 100644 --- a/apps/sim/lib/mothership/tools/handlers/sim-cli.ts +++ b/apps/sim/lib/mothership/tools/handlers/sim-cli.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { executeAgentCliRequest } from '@/lib/mothership/agent-cli' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { AgentCliRequest } from '@/lib/mothership/generated/agent-cli' import type { ToolExecutionContext, diff --git a/apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts b/apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts index 6c2727d78f8..81cf7ce552f 100644 --- a/apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts +++ b/apps/sim/lib/mothership/tools/handlers/workflow/mutations.ts @@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger' import { filterUndefined, isPlainRecord, isRecordLike } from '@sim/utils/object' import { createCopilotWorkspaceApiKey } from '@/lib/api-key/application/create-api-key' import { PlatformEvents } from '@/lib/core/telemetry' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { executeCopilotApiKeyUseCase } from '@/lib/mothership/application/execute-api-key-use-case' import { executeCopilotWorkflowUseCase, diff --git a/apps/sim/lib/mothership/tools/hosted-workbench.live.test.ts b/apps/sim/lib/mothership/tools/hosted-workbench.live.test.ts index ef95271100e..fdc2394abde 100644 --- a/apps/sim/lib/mothership/tools/hosted-workbench.live.test.ts +++ b/apps/sim/lib/mothership/tools/hosted-workbench.live.test.ts @@ -11,7 +11,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { closeRedisConnection, getRedisClient } from '@/lib/core/config/redis' import { CodeLanguage } from '@/lib/execution/languages' import { e2bProvider, stopE2BSessionProcess } from '@/lib/execution/remote-sandbox/e2b' -import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/execution-observer' +import { observeSandboxExecution } from '@/lib/execution/remote-sandbox/observer' import { ensureSessionSandbox } from '@/lib/execution/remote-sandbox/session' import { readSessionSandboxFile, diff --git a/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts b/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts index f0ac690788c..35c5034b581 100644 --- a/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts +++ b/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts @@ -3,7 +3,7 @@ import { toError } from '@sim/utils/errors' import { isRecordLike } from '@sim/utils/object' import { managementToolContracts } from '@/lib/api/contracts/mothership-management-tools' import { openResourceOutputSchema } from '@/lib/api/contracts/mothership-resource-tools' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { projectToolErrorMessageForCopilot } from '@/lib/mothership/request/tools/resolved-secret-result' import { searchResourceFromToolResult } from '@/lib/mothership/resources/search-tool-result' import type { ToolExecutionResult, ToolHandler } from '@/lib/mothership/tool-executor/types' diff --git a/apps/sim/lib/mothership/tools/server/base-tool.ts b/apps/sim/lib/mothership/tools/server/base-tool.ts index 20256b1e8b4..e018a525c48 100644 --- a/apps/sim/lib/mothership/tools/server/base-tool.ts +++ b/apps/sim/lib/mothership/tools/server/base-tool.ts @@ -1,5 +1,5 @@ import type { z } from 'zod' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { WorkspaceSearchFilters } from '@/lib/knowledge/search/filters' import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/mothership/tools/server/docs/search-docs.test.ts b/apps/sim/lib/mothership/tools/server/docs/search-docs.test.ts index 09e33ed537a..aad3b4e0596 100644 --- a/apps/sim/lib/mothership/tools/server/docs/search-docs.test.ts +++ b/apps/sim/lib/mothership/tools/server/docs/search-docs.test.ts @@ -1,12 +1,12 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { DocsSearchOutcome } from '@/lib/mothership/docs/docs-search' +import type { DocsSearchOutcome } from '@/lib/mothership/docs/search' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' const { mockSearchDocs } = vi.hoisted(() => ({ mockSearchDocs: vi.fn(), })) -vi.mock('@/lib/mothership/docs/docs-search', () => ({ +vi.mock('@/lib/mothership/docs/search', () => ({ searchDocs: mockSearchDocs, })) diff --git a/apps/sim/lib/mothership/tools/server/docs/search-docs.ts b/apps/sim/lib/mothership/tools/server/docs/search-docs.ts index b33e38ee1ee..5030de62492 100644 --- a/apps/sim/lib/mothership/tools/server/docs/search-docs.ts +++ b/apps/sim/lib/mothership/tools/server/docs/search-docs.ts @@ -1,5 +1,5 @@ -import type { DocsSearchResult } from '@/lib/mothership/docs/docs-search' -import { searchDocs } from '@/lib/mothership/docs/docs-search' +import type { DocsSearchResult } from '@/lib/mothership/docs/search' +import { searchDocs } from '@/lib/mothership/docs/search' import { SearchDocs } from '@/lib/mothership/generated/tool-catalog-v1' import type { BaseServerTool, ServerToolContext } from '@/lib/mothership/tools/server/base-tool' import { ServerToolModelInputError } from '@/lib/mothership/tools/server/model-input' @@ -54,7 +54,7 @@ function shortfallNote(outcome: Awaited>): string * Vector search over Sim's product documentation, scoped to the same pages the * agent can `read` from the `docs/` VFS tree. Normal delegation exposes it to * the platform agent; the `@Docs` compatibility path also invokes it directly. - * Corpus logic lives in `@/lib/mothership/docs/docs-search`. + * Corpus logic lives in `@/lib/mothership/docs/search`. */ export const searchDocsServerTool: BaseServerTool = { name: SearchDocs.id, diff --git a/apps/sim/lib/mothership/tools/server/files/edit-content.ts b/apps/sim/lib/mothership/tools/server/files/edit-content.ts index 8dcf62ae32a..a4e4559c6bc 100644 --- a/apps/sim/lib/mothership/tools/server/files/edit-content.ts +++ b/apps/sim/lib/mothership/tools/server/files/edit-content.ts @@ -24,7 +24,7 @@ import { SIM_PAGE_CONTENT_TYPE, } from '@/lib/workspace-files/page-compile' import { buildEmbeddedImageRefWarning } from './embedded-image-refs' -import { waitForLatestFileIntent } from './file-intent-store' +import { waitForLatestFileIntent } from './intent-store' import { compileDocForWrite, getDocumentFormatInfo, inferContentType } from './workspace-file' const logger = createLogger('EditContentServerTool') diff --git a/apps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts b/apps/sim/lib/mothership/tools/server/files/edit-roundtrip.test.ts similarity index 97% rename from apps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts rename to apps/sim/lib/mothership/tools/server/files/edit-roundtrip.test.ts index 44869517b43..224672334b9 100644 --- a/apps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts +++ b/apps/sim/lib/mothership/tools/server/files/edit-roundtrip.test.ts @@ -1,7 +1,7 @@ import { generateId } from '@sim/utils/id' import { describe, expect, it, vi } from 'vitest' import type { ServerToolContext } from '@/lib/mothership/tools/server/base-tool' -import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/file-manager' const { executeFileUseCase, compileDoc, runSandboxTask } = vi.hoisted(() => ({ executeFileUseCase: vi.fn(), @@ -27,7 +27,7 @@ vi.mock('@/lib/uploads/documents/compile', () => ({ vi.mock('@/lib/mothership/tools/server/files/embedded-image-refs', () => ({ buildEmbeddedImageRefWarning: async () => '', })) -vi.mock('@/lib/mothership/tools/server/files/file-folder-application', () => ({ +vi.mock('@/lib/mothership/tools/server/files/folder-application', () => ({ ensureCopilotFileFolderPath: async () => null, })) vi.mock('@/lib/workspace-files/application/create-workspace-file', () => ({ @@ -52,7 +52,7 @@ vi.mock('@/lib/workspace-files/application/update-workspace-file-content', () => import { extractResourcesFromToolResult } from '@/lib/mothership/resources/extraction' import { editContentServerTool } from '@/lib/mothership/tools/server/files/edit-content' -import { consumeLatestFileIntent } from '@/lib/mothership/tools/server/files/file-intent-store' +import { consumeLatestFileIntent } from '@/lib/mothership/tools/server/files/intent-store' import { workspaceFileServerTool } from '@/lib/mothership/tools/server/files/workspace-file' import { createWorkspaceFile } from '@/lib/workspace-files/application/create-workspace-file' import { updateWorkspaceFileContent } from '@/lib/workspace-files/application/update-workspace-file-content' diff --git a/apps/sim/lib/mothership/tools/server/files/file-folder-application.ts b/apps/sim/lib/mothership/tools/server/files/folder-application.ts similarity index 92% rename from apps/sim/lib/mothership/tools/server/files/file-folder-application.ts rename to apps/sim/lib/mothership/tools/server/files/folder-application.ts index d5c19c9f6fe..8293aa5ba7c 100644 --- a/apps/sim/lib/mothership/tools/server/files/file-folder-application.ts +++ b/apps/sim/lib/mothership/tools/server/files/folder-application.ts @@ -1,7 +1,7 @@ import { executeCopilotFileUseCase } from '@/lib/mothership/application/execute-file-use-case' import type { CopilotFileDelegationContext } from '@/lib/mothership/auth/file-delegation' -import { findWorkspaceFileFolderIdByPath } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' -import { createWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/workspace-file-folders' +import { findWorkspaceFileFolderIdByPath } from '@/lib/uploads/contexts/workspace/file-folder-manager' +import { createWorkspaceFileFolderOperation } from '@/lib/workspace-files/application/folders' /** Creates missing parent folders through the shared folder application operation. */ export async function ensureCopilotFileFolderPath( diff --git a/apps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts b/apps/sim/lib/mothership/tools/server/files/intent-store.test.ts similarity index 98% rename from apps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts rename to apps/sim/lib/mothership/tools/server/files/intent-store.test.ts index 5e1247540b5..83665802d28 100644 --- a/apps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts +++ b/apps/sim/lib/mothership/tools/server/files/intent-store.test.ts @@ -6,7 +6,7 @@ import { type PendingFileIntent, storeFileIntent, waitForLatestFileIntent, -} from './file-intent-store' +} from './intent-store' function makeIntent(overrides: Partial): PendingFileIntent { return { @@ -26,7 +26,7 @@ function uniqueWorkspace(): string { return `ws-${generateShortId()}` } -describe('file-intent-store channel scoping', () => { +describe('file intent store channel scoping', () => { it('consumes the intent for the requesting channel, not the latest in the message', async () => { const ws = uniqueWorkspace() const scope = { chatId: 'chat-1', messageId: 'msg-1' } diff --git a/apps/sim/lib/mothership/tools/server/files/file-intent-store.ts b/apps/sim/lib/mothership/tools/server/files/intent-store.ts similarity index 99% rename from apps/sim/lib/mothership/tools/server/files/file-intent-store.ts rename to apps/sim/lib/mothership/tools/server/files/intent-store.ts index 30fe0c8be58..7fdfdb1c833 100644 --- a/apps/sim/lib/mothership/tools/server/files/file-intent-store.ts +++ b/apps/sim/lib/mothership/tools/server/files/intent-store.ts @@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' import { sleep } from '@sim/utils/helpers' import { getRedisClient } from '@/lib/core/config/redis' -import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/file-manager' export type PendingFileIntent = { operation: 'append' | 'update' | 'patch' diff --git a/apps/sim/lib/mothership/tools/server/files/file-preview.test.ts b/apps/sim/lib/mothership/tools/server/files/preview.test.ts similarity index 99% rename from apps/sim/lib/mothership/tools/server/files/file-preview.test.ts rename to apps/sim/lib/mothership/tools/server/files/preview.test.ts index f12553b208e..a56bce5f10c 100644 --- a/apps/sim/lib/mothership/tools/server/files/file-preview.test.ts +++ b/apps/sim/lib/mothership/tools/server/files/preview.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { buildFilePreviewText } from '@/lib/mothership/tools/server/files/file-preview' +import { buildFilePreviewText } from '@/lib/mothership/tools/server/files/preview' describe('buildFilePreviewText', () => { it('returns the full streamed content for update previews', () => { diff --git a/apps/sim/lib/mothership/tools/server/files/file-preview.ts b/apps/sim/lib/mothership/tools/server/files/preview.ts similarity index 100% rename from apps/sim/lib/mothership/tools/server/files/file-preview.ts rename to apps/sim/lib/mothership/tools/server/files/preview.ts diff --git a/apps/sim/lib/mothership/tools/server/files/workspace-file.ts b/apps/sim/lib/mothership/tools/server/files/workspace-file.ts index 58898a2dd46..45d7de31ef4 100644 --- a/apps/sim/lib/mothership/tools/server/files/workspace-file.ts +++ b/apps/sim/lib/mothership/tools/server/files/workspace-file.ts @@ -19,7 +19,7 @@ import { type BaseServerTool, type ServerToolContext, } from '@/lib/mothership/tools/server/base-tool' -import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/file-manager' import { compileDoc, DOCXJS_SOURCE_MIME, @@ -37,10 +37,10 @@ import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata' import { renameWorkspaceFile } from '@/lib/workspace-files/application/rename-workspace-file' import { parseOwnedFileReference } from '@/lib/workspace-files/owned-files' -import type { SandboxTaskId } from '@/sandbox-tasks/registry' +import type { SandboxTaskId } from '@/sandboxes/registry' import { buildEmbeddedImageRefWarning } from './embedded-image-refs' -import { ensureCopilotFileFolderPath } from './file-folder-application' -import { storeFileIntent } from './file-intent-store' +import { ensureCopilotFileFolderPath } from './folder-application' +import { storeFileIntent } from './intent-store' const logger = createLogger('WorkspaceFileServerTool') diff --git a/apps/sim/lib/mothership/tools/server/image/generate-image.test.ts b/apps/sim/lib/mothership/tools/server/image/generate-image.test.ts index 58391d34b22..a500e164f57 100644 --- a/apps/sim/lib/mothership/tools/server/image/generate-image.test.ts +++ b/apps/sim/lib/mothership/tools/server/image/generate-image.test.ts @@ -45,7 +45,7 @@ vi.mock('@/lib/workspace-files/application/read-workspace-file-content', async ( } }) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/mothership/tools/server/image/generate-image.ts b/apps/sim/lib/mothership/tools/server/image/generate-image.ts index 096e4f63dc4..bb7f4614619 100644 --- a/apps/sim/lib/mothership/tools/server/image/generate-image.ts +++ b/apps/sim/lib/mothership/tools/server/image/generate-image.ts @@ -16,8 +16,8 @@ import { type ServerToolContext, } from '@/lib/mothership/tools/server/base-tool' import { writeCopilotWorkspaceFileByPath } from '@/lib/mothership/vfs/resource-writer' -import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/file-manager' +import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { fileOperations } from '@/lib/workspace-files/application/operations' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' diff --git a/apps/sim/lib/mothership/tools/server/media/ffmpeg.test.ts b/apps/sim/lib/mothership/tools/server/media/ffmpeg.test.ts index 62c26086625..12d85bc6afd 100644 --- a/apps/sim/lib/mothership/tools/server/media/ffmpeg.test.ts +++ b/apps/sim/lib/mothership/tools/server/media/ffmpeg.test.ts @@ -7,7 +7,7 @@ import { workspaceFileSecretProvenanceMockFns, } from '@sim/testing/mocks/workspace-file-secret-provenance.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' const { runFfmpegOperationMock, writeWorkspaceFileByPathMock } = vi.hoisted(() => ({ @@ -39,10 +39,10 @@ vi.mock('@/lib/media/ffmpeg', () => ({ runFfmpegOperation: runFfmpegOperationMock, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/mothership/tools/server/media/ffmpeg.ts b/apps/sim/lib/mothership/tools/server/media/ffmpeg.ts index aa13ad4258b..e075fa585e3 100644 --- a/apps/sim/lib/mothership/tools/server/media/ffmpeg.ts +++ b/apps/sim/lib/mothership/tools/server/media/ffmpeg.ts @@ -20,7 +20,7 @@ import { createWorkspaceFileSecretProvenanceFromRegistry, mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { fileOperations } from '@/lib/workspace-files/application/operations' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' import { projectResolvedSecretModelContent } from '@/executor/utils/resolved-secret-content-projection' diff --git a/apps/sim/lib/mothership/tools/server/media/generate-audio.ts b/apps/sim/lib/mothership/tools/server/media/generate-audio.ts index 44afdb84f96..ffab97f3143 100644 --- a/apps/sim/lib/mothership/tools/server/media/generate-audio.ts +++ b/apps/sim/lib/mothership/tools/server/media/generate-audio.ts @@ -14,7 +14,7 @@ import { type ServerToolContext, } from '@/lib/mothership/tools/server/base-tool' import { writeCopilotWorkspaceFileByPath } from '@/lib/mothership/vfs/resource-writer' -import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { fileOperations } from '@/lib/workspace-files/application/operations' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' diff --git a/apps/sim/lib/mothership/tools/server/media/generate-video.ts b/apps/sim/lib/mothership/tools/server/media/generate-video.ts index 95bfed86039..1ad4bef38b5 100644 --- a/apps/sim/lib/mothership/tools/server/media/generate-video.ts +++ b/apps/sim/lib/mothership/tools/server/media/generate-video.ts @@ -14,7 +14,7 @@ import { type ServerToolContext, } from '@/lib/mothership/tools/server/base-tool' import { writeCopilotWorkspaceFileByPath } from '@/lib/mothership/vfs/resource-writer' -import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { createWorkspaceFileSecretProvenanceFromRegistry } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { fileOperations } from '@/lib/workspace-files/application/operations' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' diff --git a/apps/sim/lib/mothership/tools/server/media/model-boundaries.test.ts b/apps/sim/lib/mothership/tools/server/media/model-boundaries.test.ts index 6405fae671f..2e2d379bfb7 100644 --- a/apps/sim/lib/mothership/tools/server/media/model-boundaries.test.ts +++ b/apps/sim/lib/mothership/tools/server/media/model-boundaries.test.ts @@ -26,7 +26,7 @@ vi.mock('@/lib/mothership/vfs/resource-writer', () => ({ vi.mock('@/lib/media/falai-audio', () => ({ generateFalAudio: mockGenerateFalAudio })) vi.mock('@/lib/media/falai-video', () => ({ generateFalVideo: mockGenerateFalVideo })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/mothership/tools/server/open-resource.ts b/apps/sim/lib/mothership/tools/server/open-resource.ts index 07015373de3..e98302b4708 100644 --- a/apps/sim/lib/mothership/tools/server/open-resource.ts +++ b/apps/sim/lib/mothership/tools/server/open-resource.ts @@ -10,7 +10,7 @@ import { readKnowledgeBase } from '@/lib/knowledge/application/knowledge-bases' import { logDelegationPolicy } from '@/lib/logs/application/authorization' import { logOperations } from '@/lib/logs/application/operations' import { readLogDetailUseCase } from '@/lib/logs/application/read-log-detail' -import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter' +import { createCopilotApplicationAdapter } from '@/lib/mothership/application/adapter' import { executeDashboardUseCase } from '@/lib/mothership/application/execute-dashboard-use-case' import { executeCopilotFileUseCase } from '@/lib/mothership/application/execute-file-use-case' import { executeCopilotKnowledgeUseCase } from '@/lib/mothership/application/execute-knowledge-use-case' diff --git a/apps/sim/lib/mothership/tools/server/search-sources.ts b/apps/sim/lib/mothership/tools/server/search-sources.ts index 2f59f1ffe7a..fef87232f34 100644 --- a/apps/sim/lib/mothership/tools/server/search-sources.ts +++ b/apps/sim/lib/mothership/tools/server/search-sources.ts @@ -23,7 +23,7 @@ import { authorizeOrganizationChatDelegation } from '@/lib/mothership/chat/organ import type { BaseServerTool } from '@/lib/mothership/tools/server/base-tool' import { organizationRoutes } from '@/lib/navigation/paths' import { canConnectPersonally, SEARCH_SOURCE_TYPES } from '@/lib/sim-search/connectors' -import { searchSetupAccessParam, searchSetupParam } from '@/lib/sim-search/search-params' +import { searchSetupAccessParam, searchSetupParam } from '@/lib/sim-search/params' /** Organization Search controls reuse the product operations and its credential collection UI. */ export const organizationSearchSourcesServerTool: BaseServerTool< diff --git a/apps/sim/lib/mothership/tools/server/settings-custom-blocks.test.ts b/apps/sim/lib/mothership/tools/server/settings-custom-blocks.test.ts index 8d93816c55a..501f04220ce 100644 --- a/apps/sim/lib/mothership/tools/server/settings-custom-blocks.test.ts +++ b/apps/sim/lib/mothership/tools/server/settings-custom-blocks.test.ts @@ -13,7 +13,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { SettingsContext } from '@/lib/mothership/application/settings-context' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/custom-blocks/operations', () => customBlockOperationsMock) import { customBlockSettingsActions } from '@/lib/mothership/tools/server/settings-custom-blocks' diff --git a/apps/sim/lib/mothership/tools/server/workspace-list.ts b/apps/sim/lib/mothership/tools/server/workspace-list.ts index dee01fb57c1..8095e817d30 100644 --- a/apps/sim/lib/mothership/tools/server/workspace-list.ts +++ b/apps/sim/lib/mothership/tools/server/workspace-list.ts @@ -1,5 +1,5 @@ import { listWorkspacesInputSchema } from '@/lib/api/contracts/mothership-assistant-tools' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { executeOrganizationWorkspaceUseCase } from '@/lib/mothership/application/execute-organization-workspace-use-case' import type { BaseServerTool } from '@/lib/mothership/tools/server/base-tool' import { listOrganizationWorkspaces } from '@/lib/workspaces/application/list-organization-workspaces' diff --git a/apps/sim/lib/mothership/tools/server/workspaces.ts b/apps/sim/lib/mothership/tools/server/workspaces.ts index da02a2ba44e..2ae7ba76097 100644 --- a/apps/sim/lib/mothership/tools/server/workspaces.ts +++ b/apps/sim/lib/mothership/tools/server/workspaces.ts @@ -1,5 +1,5 @@ import { mothershipWorkspacesInputSchema } from '@/lib/api/contracts/mothership-management-tools' -import { messageForCopilotApplicationError } from '@/lib/mothership/application/error' +import { messageForCopilotApplicationError } from '@/lib/mothership/application/errors' import { executeOrganizationWorkspaceUseCase } from '@/lib/mothership/application/execute-organization-workspace-use-case' import type { ResourceChange } from '@/lib/mothership/generated/resources' import type { BaseServerTool } from '@/lib/mothership/tools/server/base-tool' diff --git a/apps/sim/lib/mothership/vfs/read-placeholders.ts b/apps/sim/lib/mothership/vfs/read-placeholders.ts index 634b5f3fe0a..1c51a7a2fdc 100644 --- a/apps/sim/lib/mothership/vfs/read-placeholders.ts +++ b/apps/sim/lib/mothership/vfs/read-placeholders.ts @@ -8,7 +8,7 @@ * misclassified as one. Neither is possible when the producer states what it built. */ -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' /** * `oversized` — the file is intact but reading it was refused on size, so the read diff --git a/apps/sim/lib/mothership/vfs/resource-writer.test.ts b/apps/sim/lib/mothership/vfs/resource-writer.test.ts index 626eef2d5cb..7659a9f70e9 100644 --- a/apps/sim/lib/mothership/vfs/resource-writer.test.ts +++ b/apps/sim/lib/mothership/vfs/resource-writer.test.ts @@ -25,12 +25,9 @@ vi.mock('@/lib/workspace-files/application/create-workspace-file', () => ({ admitCreateWorkspaceFile: hoisted.admitCreateWorkspaceFile, })) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspace-files/application/write-workspace-file-by-path', () => ({ createWorkspaceFileBufferByPath: hoisted.createWorkspaceFileBufferByPath, diff --git a/apps/sim/lib/mothership/vfs/resource-writer.ts b/apps/sim/lib/mothership/vfs/resource-writer.ts index dac2374adc1..b9e9fb1fc2d 100644 --- a/apps/sim/lib/mothership/vfs/resource-writer.ts +++ b/apps/sim/lib/mothership/vfs/resource-writer.ts @@ -8,12 +8,12 @@ import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils' import { findWorkspaceFileFolderIdByPath, listWorkspaceFileFolders, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { getWorkspaceFileByName, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { admitCreateWorkspaceFile } from '@/lib/workspace-files/application/create-workspace-file' import { fileOperations } from '@/lib/workspace-files/application/operations' import { resolveWorkspaceFileReference } from '@/lib/workspace-files/application/resolve-workspace-file-reference' @@ -21,7 +21,7 @@ import { createWorkspaceFileBufferByPath, updateWorkspaceFileContentBufferByPath, } from '@/lib/workspace-files/application/write-workspace-file-by-path' -import { parseWorkspaceFileCreatePath } from '@/lib/workspace-files/workspace-file-path' +import { parseWorkspaceFileCreatePath } from '@/lib/workspace-files/file-path' export type WorkspaceFileWriteMode = 'create' | 'overwrite' diff --git a/apps/sim/lib/permission-groups/application/read-user-config.test.ts b/apps/sim/lib/permission-groups/application/read-user-config.test.ts index 91556c315c5..442a64bbf78 100644 --- a/apps/sim/lib/permission-groups/application/read-user-config.test.ts +++ b/apps/sim/lib/permission-groups/application/read-user-config.test.ts @@ -18,7 +18,7 @@ import { } from '@sim/testing/mocks/workspace-context.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) vi.mock('@/lib/permission-groups/resolve.server', () => permissionGroupsResolveMock) diff --git a/apps/sim/lib/permission-groups/application/read-user-config.ts b/apps/sim/lib/permission-groups/application/read-user-config.ts index b1dd779d202..de27d742331 100644 --- a/apps/sim/lib/permission-groups/application/read-user-config.ts +++ b/apps/sim/lib/permission-groups/application/read-user-config.ts @@ -5,7 +5,7 @@ import { isOrganizationPermissionRegimeActive, resolveWorkspaceGroup, } from '@/lib/permission-groups/resolve.server' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { isOrganizationAdminOrOwner } from '@/lib/workspaces/permissions/utils' export const readUserPermissionConfig = defineAuthorizedWorkspaceUseCase({ diff --git a/apps/sim/lib/pptx-renderer/shapes/shape-arc.ts b/apps/sim/lib/pptx-renderer/shapes/arc.ts similarity index 100% rename from apps/sim/lib/pptx-renderer/shapes/shape-arc.ts rename to apps/sim/lib/pptx-renderer/shapes/arc.ts diff --git a/apps/sim/lib/pptx-renderer/shapes/presets.ts b/apps/sim/lib/pptx-renderer/shapes/presets.ts index c9334c78d36..7713fbed978 100644 --- a/apps/sim/lib/pptx-renderer/shapes/presets.ts +++ b/apps/sim/lib/pptx-renderer/shapes/presets.ts @@ -12,7 +12,7 @@ const logger = createLogger('PptxShapePresets') * (so 50000 = 50%). */ -import { shapeArc } from './shape-arc' +import { shapeArc } from './arc' type PresetShapeGenerator = (w: number, h: number, adjustments?: Map) => string diff --git a/apps/sim/lib/projects/files/__integration__/private-purge.integration.ts b/apps/sim/lib/projects/files/__integration__/private-purge.integration.ts index dfb464cceaa..ddef04583d1 100644 --- a/apps/sim/lib/projects/files/__integration__/private-purge.integration.ts +++ b/apps/sim/lib/projects/files/__integration__/private-purge.integration.ts @@ -35,7 +35,7 @@ import { resolveProjectStorageBillingContext } from '@/lib/billing/storage/conte import { prepareFileStorageMutationInTx } from '@/lib/billing/storage/tracking' import { processOutboxEventById } from '@/lib/core/outbox/service' import { prepareProjectsForAccountDeletion } from '@/lib/projects/account-deletion' -import { workspaceFileStorageCleanupOutboxHandlers } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import { workspaceFileStorageCleanupOutboxHandlers } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { UPLOAD_URL_TTL_MS } from '@/lib/uploads/upload-session/provider' import { PROJECT_FILE_UPLOAD_BINDING_KEY } from '@/lib/uploads/upload-session/types' import { deleteUserAccount } from '@/lib/users/account-deletion' diff --git a/apps/sim/lib/projects/files/__integration__/retention.integration.ts b/apps/sim/lib/projects/files/__integration__/retention.integration.ts index 3090c5c55aa..c37eaabe0b8 100644 --- a/apps/sim/lib/projects/files/__integration__/retention.integration.ts +++ b/apps/sim/lib/projects/files/__integration__/retention.integration.ts @@ -40,8 +40,8 @@ import { FILES_PER_QUERY } from '@/lib/file-retention/versions' import { authorizeProject } from '@/lib/projects/application/authorization' import { projectOperations } from '@/lib/projects/application/operations' import { lockWorkspaceProject } from '@/lib/projects/membership' -import { processWorkspaceFileStorageCleanupsNow } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' -import { deleteWorkspaceFileVersionInTx } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { processWorkspaceFileStorageCleanupsNow } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' +import { deleteWorkspaceFileVersionInTx } from '@/lib/uploads/contexts/workspace/file-version-store' import { deleteFile, downloadFile, uploadFile } from '@/lib/uploads/core/storage-service' import { runCleanupFileVersions } from '@/background/cleanup-file-versions' import { runCleanupSoftDeletes } from '@/background/cleanup-soft-deletes' diff --git a/apps/sim/lib/projects/files/purge.ts b/apps/sim/lib/projects/files/purge.ts index 8a172ee6abd..1147fa2e2dc 100644 --- a/apps/sim/lib/projects/files/purge.ts +++ b/apps/sim/lib/projects/files/purge.ts @@ -2,7 +2,7 @@ import { folder, publicShare, workspaceFiles, workspaceFileVersion } from '@sim/ import { and, asc, eq, gt, inArray } from 'drizzle-orm' import type { DbTransaction } from '@/lib/db/types' import { retireProjectUploadsInTx } from '@/lib/projects/files/prefix-cleanup' -import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { lockFileDirectories } from '@/lib/workspace-files/locks' const PURGE_BATCH_SIZE = 500 diff --git a/apps/sim/lib/projects/files/retention.ts b/apps/sim/lib/projects/files/retention.ts index 3409c585039..3453811f581 100644 --- a/apps/sim/lib/projects/files/retention.ts +++ b/apps/sim/lib/projects/files/retention.ts @@ -22,11 +22,11 @@ import { selectExpiredFileVersions, } from '@/lib/file-retention/versions' import { lockProject } from '@/lib/projects/membership' -import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { MAX_SUPERSEDED_FILE_VERSIONS, releaseWorkspaceFileVersionsForPurgeInTx, -} from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-version-store' import { lockFileDirectories } from '@/lib/workspace-files/locks' import { fileOwnerCondition } from '@/lib/workspace-files/ownership-query' diff --git a/apps/sim/lib/public-shares/share-manager.ts b/apps/sim/lib/public-shares/manager.ts similarity index 100% rename from apps/sim/lib/public-shares/share-manager.ts rename to apps/sim/lib/public-shares/manager.ts diff --git a/apps/sim/lib/sandboxes/application/use-cases.ts b/apps/sim/lib/sandboxes/application/use-cases.ts index c523fb72c83..0eec1d8ea33 100644 --- a/apps/sim/lib/sandboxes/application/use-cases.ts +++ b/apps/sim/lib/sandboxes/application/use-cases.ts @@ -6,7 +6,7 @@ import { defineAuthorizedWorkspaceUseCase, ForbiddenOperationError } from '@/lib import { OrchestrationError } from '@/lib/core/orchestration/types' import type { SandboxCliToolId } from '@/lib/execution/remote-sandbox/cli-tools' import { MAX_PLAN_REQUIRED } from '@/lib/execution/remote-sandbox/entitlement' -import type { SandboxLanguage } from '@/lib/execution/remote-sandbox/sandbox-spec' +import type { SandboxLanguage } from '@/lib/execution/remote-sandbox/spec' import { createWorkspaceSandbox, currentSandboxStrategy, diff --git a/apps/sim/lib/selectors/application/resolve-scope.ts b/apps/sim/lib/selectors/application/resolve-scope.ts index 9d681163bee..443700bea4d 100644 --- a/apps/sim/lib/selectors/application/resolve-scope.ts +++ b/apps/sim/lib/selectors/application/resolve-scope.ts @@ -7,8 +7,8 @@ import { SelectorContextUnavailableError } from '@/lib/selectors/server/errors' import type { SelectorManifestEntry, SelectorScope } from '@/lib/selectors/types' import type { ActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' import { resolveActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' -import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import type { ActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export type WorkspaceSelectorApplicationContext = ( | ActiveWorkflowApplicationContext diff --git a/apps/sim/lib/selectors/server/internal.ts b/apps/sim/lib/selectors/server/internal.ts index 887e8019195..63bdda82fb3 100644 --- a/apps/sim/lib/selectors/server/internal.ts +++ b/apps/sim/lib/selectors/server/internal.ts @@ -1,6 +1,6 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { getWorkspaceOrganizationAccounts } from '@/lib/credential-groups/application/workspace-organization-accounts' -import { listInternalCredentials } from '@/lib/credentials/application/credential-crud' +import { listInternalCredentials } from '@/lib/credentials/application/crud' import { fetchOllamaEmbeddingModelCatalog } from '@/lib/embeddings/ollama-model-catalog.server' import { fetchOpenRouterEmbeddingModelCatalog } from '@/lib/embeddings/openrouter-model-catalog.server' import { getEffectiveEnvironmentVariableNames } from '@/lib/environment/utils' diff --git a/apps/sim/lib/selectors/server/providers/airtable.ts b/apps/sim/lib/selectors/server/providers/airtable.ts index 23dfa9cee43..4ff20ed454a 100644 --- a/apps/sim/lib/selectors/server/providers/airtable.ts +++ b/apps/sim/lib/selectors/server/providers/airtable.ts @@ -9,7 +9,7 @@ import { } from '@/lib/selectors/server/errors' import { appendSelectorOptions } from '@/lib/selectors/server/option-budget' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/asana.ts b/apps/sim/lib/selectors/server/providers/asana.ts index e325f9eb037..c6c08dfadef 100644 --- a/apps/sim/lib/selectors/server/providers/asana.ts +++ b/apps/sim/lib/selectors/server/providers/asana.ts @@ -6,7 +6,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/atlassian.test.ts b/apps/sim/lib/selectors/server/providers/atlassian.test.ts index 323e95d0598..79fd3fb37cc 100644 --- a/apps/sim/lib/selectors/server/providers/atlassian.test.ts +++ b/apps/sim/lib/selectors/server/providers/atlassian.test.ts @@ -8,7 +8,7 @@ const { mockFetchProviderJsonWithStatus } = vi.hoisted(() => ({ mockFetchProviderJsonWithStatus: vi.fn(), })) -vi.mock('@/lib/selectors/server/providers/provider-http', () => ({ +vi.mock('@/lib/selectors/server/providers/http', () => ({ fetchProviderJsonWithStatus: mockFetchProviderJsonWithStatus, RetryableProviderNetworkError: class RetryableProviderNetworkError extends Error {}, })) @@ -20,7 +20,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { resolveSelectorAtlassianCloudId } from '@/lib/selectors/server/providers/atlassian' -import { RetryableProviderNetworkError } from '@/lib/selectors/server/providers/provider-http' +import { RetryableProviderNetworkError } from '@/lib/selectors/server/providers/http' const mockRetryWithExponentialBackoff = knowledgeDocumentsUtilsMockFns.mockRetryWithExponentialBackoff diff --git a/apps/sim/lib/selectors/server/providers/atlassian.ts b/apps/sim/lib/selectors/server/providers/atlassian.ts index 5b2b59b82c5..5e3a5808e78 100644 --- a/apps/sim/lib/selectors/server/providers/atlassian.ts +++ b/apps/sim/lib/selectors/server/providers/atlassian.ts @@ -8,7 +8,7 @@ import { import { fetchProviderJsonWithStatus, RetryableProviderNetworkError, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' const ATLASSIAN_ACCESSIBLE_RESOURCES_URL = 'https://api.atlassian.com/oauth/token/accessible-resources' diff --git a/apps/sim/lib/selectors/server/providers/attio.ts b/apps/sim/lib/selectors/server/providers/attio.ts index 062ac8ac6b7..e162ad309dc 100644 --- a/apps/sim/lib/selectors/server/providers/attio.ts +++ b/apps/sim/lib/selectors/server/providers/attio.ts @@ -6,7 +6,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/bigquery.ts b/apps/sim/lib/selectors/server/providers/bigquery.ts index 5efa62e389d..50183655dab 100644 --- a/apps/sim/lib/selectors/server/providers/bigquery.ts +++ b/apps/sim/lib/selectors/server/providers/bigquery.ts @@ -10,7 +10,7 @@ import { import { fetchProviderJson, fetchProviderJsonWithStatus, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/bitbucket.ts b/apps/sim/lib/selectors/server/providers/bitbucket.ts index 99b1b112b51..aaf8e157061 100644 --- a/apps/sim/lib/selectors/server/providers/bitbucket.ts +++ b/apps/sim/lib/selectors/server/providers/bitbucket.ts @@ -6,7 +6,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/calcom.ts b/apps/sim/lib/selectors/server/providers/calcom.ts index 3640ecb6c62..0dff79be246 100644 --- a/apps/sim/lib/selectors/server/providers/calcom.ts +++ b/apps/sim/lib/selectors/server/providers/calcom.ts @@ -6,7 +6,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/clickup.test.ts b/apps/sim/lib/selectors/server/providers/clickup.test.ts index cb54c85e6b7..4ec914732d7 100644 --- a/apps/sim/lib/selectors/server/providers/clickup.test.ts +++ b/apps/sim/lib/selectors/server/providers/clickup.test.ts @@ -8,7 +8,7 @@ const { mockFetchProviderJson } = vi.hoisted(() => ({ mockFetchProviderJson: vi.fn(), })) -vi.mock('@/lib/selectors/server/providers/provider-http', () => ({ +vi.mock('@/lib/selectors/server/providers/http', () => ({ fetchProviderJson: mockFetchProviderJson, })) diff --git a/apps/sim/lib/selectors/server/providers/clickup.ts b/apps/sim/lib/selectors/server/providers/clickup.ts index 0b506f815eb..e1cc7467223 100644 --- a/apps/sim/lib/selectors/server/providers/clickup.ts +++ b/apps/sim/lib/selectors/server/providers/clickup.ts @@ -6,7 +6,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { type ExecuteServerSelectorArgs, listSelectorResult, diff --git a/apps/sim/lib/selectors/server/providers/cloudwatch.ts b/apps/sim/lib/selectors/server/providers/cloudwatch.ts index cc9dd3e7edd..042d2f2e0e9 100644 --- a/apps/sim/lib/selectors/server/providers/cloudwatch.ts +++ b/apps/sim/lib/selectors/server/providers/cloudwatch.ts @@ -4,7 +4,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import type { ServerSelectorAttachmentMap } from '@/lib/selectors/server/types' import { detailSelectorResult, listSelectorResult } from '@/lib/selectors/server/types' import { diff --git a/apps/sim/lib/selectors/server/providers/coda.ts b/apps/sim/lib/selectors/server/providers/coda.ts index 14db8f8e837..f03cfe6c076 100644 --- a/apps/sim/lib/selectors/server/providers/coda.ts +++ b/apps/sim/lib/selectors/server/providers/coda.ts @@ -11,7 +11,7 @@ import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/provider import { fetchProviderJson, fetchProviderJsonWithStatus, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/confluence.test.ts b/apps/sim/lib/selectors/server/providers/confluence.test.ts index 0ad1a53c6e0..7098431e967 100644 --- a/apps/sim/lib/selectors/server/providers/confluence.test.ts +++ b/apps/sim/lib/selectors/server/providers/confluence.test.ts @@ -18,7 +18,7 @@ vi.mock('@/lib/selectors/server/providers/atlassian', () => ({ import { SelectorOptionsUnavailableError } from '@/lib/selectors/server/errors' import { createSelectorProtectedValues } from '@/lib/selectors/server/protected-values' import { confluenceSelectorAttachments } from '@/lib/selectors/server/providers/confluence' -import * as providerHttp from '@/lib/selectors/server/providers/provider-http' +import * as providerHttp from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs } from '@/lib/selectors/server/types' const mockResolveCredentialBundle = diff --git a/apps/sim/lib/selectors/server/providers/confluence.ts b/apps/sim/lib/selectors/server/providers/confluence.ts index dfaee7bfb51..87b5010dad2 100644 --- a/apps/sim/lib/selectors/server/providers/confluence.ts +++ b/apps/sim/lib/selectors/server/providers/confluence.ts @@ -6,7 +6,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorAtlassianCloudId } from '@/lib/selectors/server/providers/atlassian' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/fivetran.ts b/apps/sim/lib/selectors/server/providers/fivetran.ts index 30c81e1cd18..2f2d2d035f1 100644 --- a/apps/sim/lib/selectors/server/providers/fivetran.ts +++ b/apps/sim/lib/selectors/server/providers/fivetran.ts @@ -10,7 +10,7 @@ import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/provider import { fetchProviderJson, fetchProviderJsonWithStatus, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/google.ts b/apps/sim/lib/selectors/server/providers/google.ts index a8f9e20f7cf..cf596cd93a5 100644 --- a/apps/sim/lib/selectors/server/providers/google.ts +++ b/apps/sim/lib/selectors/server/providers/google.ts @@ -9,7 +9,7 @@ import { import { fetchProviderJson, fetchProviderJsonWithStatus, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/harmonic.ts b/apps/sim/lib/selectors/server/providers/harmonic.ts index 52f4f04eeed..b07923a554d 100644 --- a/apps/sim/lib/selectors/server/providers/harmonic.ts +++ b/apps/sim/lib/selectors/server/providers/harmonic.ts @@ -4,7 +4,7 @@ import { readResponseJsonWithLimit } from '@/lib/core/utils/stream-limits' import type { ServerSelectorKey } from '@/lib/selectors/manifest' import { SelectorOptionsUnavailableError } from '@/lib/selectors/server/errors' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/provider-http.test.ts b/apps/sim/lib/selectors/server/providers/http.test.ts similarity index 98% rename from apps/sim/lib/selectors/server/providers/provider-http.test.ts rename to apps/sim/lib/selectors/server/providers/http.test.ts index cb254e38ac5..d79e3a5da42 100644 --- a/apps/sim/lib/selectors/server/providers/provider-http.test.ts +++ b/apps/sim/lib/selectors/server/providers/http.test.ts @@ -7,7 +7,7 @@ import { fetchProviderJson, fetchProviderJsonWithStatus, RetryableProviderNetworkError, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' const mockFetch = vi.fn() diff --git a/apps/sim/lib/selectors/server/providers/provider-http.ts b/apps/sim/lib/selectors/server/providers/http.ts similarity index 100% rename from apps/sim/lib/selectors/server/providers/provider-http.ts rename to apps/sim/lib/selectors/server/providers/http.ts diff --git a/apps/sim/lib/selectors/server/providers/hubspot.ts b/apps/sim/lib/selectors/server/providers/hubspot.ts index be1b0d69331..2b7211c1eab 100644 --- a/apps/sim/lib/selectors/server/providers/hubspot.ts +++ b/apps/sim/lib/selectors/server/providers/hubspot.ts @@ -8,7 +8,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/jira.ts b/apps/sim/lib/selectors/server/providers/jira.ts index e27f4017516..ef71317d214 100644 --- a/apps/sim/lib/selectors/server/providers/jira.ts +++ b/apps/sim/lib/selectors/server/providers/jira.ts @@ -7,7 +7,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorAtlassianCloudId } from '@/lib/selectors/server/providers/atlassian' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/jsm.ts b/apps/sim/lib/selectors/server/providers/jsm.ts index e5507f3a6c5..692dc9009e3 100644 --- a/apps/sim/lib/selectors/server/providers/jsm.ts +++ b/apps/sim/lib/selectors/server/providers/jsm.ts @@ -7,7 +7,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorAtlassianCloudId } from '@/lib/selectors/server/providers/atlassian' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/linear.ts b/apps/sim/lib/selectors/server/providers/linear.ts index c151650cfed..d11f817d82f 100644 --- a/apps/sim/lib/selectors/server/providers/linear.ts +++ b/apps/sim/lib/selectors/server/providers/linear.ts @@ -7,7 +7,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/microsoft.ts b/apps/sim/lib/selectors/server/providers/microsoft.ts index b2984dde819..d5d183968b5 100644 --- a/apps/sim/lib/selectors/server/providers/microsoft.ts +++ b/apps/sim/lib/selectors/server/providers/microsoft.ts @@ -11,7 +11,7 @@ import { SelectorContextUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, SelectorCredentialPolicy, diff --git a/apps/sim/lib/selectors/server/providers/monday.ts b/apps/sim/lib/selectors/server/providers/monday.ts index 8a168193dc2..0d7aec9a7fd 100644 --- a/apps/sim/lib/selectors/server/providers/monday.ts +++ b/apps/sim/lib/selectors/server/providers/monday.ts @@ -6,7 +6,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/netsuite.ts b/apps/sim/lib/selectors/server/providers/netsuite.ts index 1991c6d7396..8983a73ae1b 100644 --- a/apps/sim/lib/selectors/server/providers/netsuite.ts +++ b/apps/sim/lib/selectors/server/providers/netsuite.ts @@ -11,7 +11,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/notion.ts b/apps/sim/lib/selectors/server/providers/notion.ts index fb8cf419800..13e1b475a98 100644 --- a/apps/sim/lib/selectors/server/providers/notion.ts +++ b/apps/sim/lib/selectors/server/providers/notion.ts @@ -5,7 +5,7 @@ import { SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/pipedrive.ts b/apps/sim/lib/selectors/server/providers/pipedrive.ts index b8512ee84a4..2473916fa0f 100644 --- a/apps/sim/lib/selectors/server/providers/pipedrive.ts +++ b/apps/sim/lib/selectors/server/providers/pipedrive.ts @@ -8,7 +8,7 @@ import { import { appendSelectorOptions } from '@/lib/selectors/server/option-budget' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ServerSelectorAttachmentMap } from '@/lib/selectors/server/types' import type { SafeSelectorOption } from '@/lib/selectors/types' import { getPipedriveAuthHeaders } from '@/tools/pipedrive/utils' diff --git a/apps/sim/lib/selectors/server/providers/sharepoint.ts b/apps/sim/lib/selectors/server/providers/sharepoint.ts index 0c289d7a3d0..919db6dee3c 100644 --- a/apps/sim/lib/selectors/server/providers/sharepoint.ts +++ b/apps/sim/lib/selectors/server/providers/sharepoint.ts @@ -9,7 +9,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/slack.test.ts b/apps/sim/lib/selectors/server/providers/slack.test.ts index 3fdbf60333d..928f1310f0d 100644 --- a/apps/sim/lib/selectors/server/providers/slack.test.ts +++ b/apps/sim/lib/selectors/server/providers/slack.test.ts @@ -10,7 +10,7 @@ const { mockFetchProviderJson } = vi.hoisted(() => ({ mockFetchProviderJson: vi.fn(), })) -vi.mock('@/lib/selectors/server/providers/provider-http', () => ({ +vi.mock('@/lib/selectors/server/providers/http', () => ({ fetchProviderJson: mockFetchProviderJson, })) diff --git a/apps/sim/lib/selectors/server/providers/slack.ts b/apps/sim/lib/selectors/server/providers/slack.ts index 93f5400b315..a83d5b6ce00 100644 --- a/apps/sim/lib/selectors/server/providers/slack.ts +++ b/apps/sim/lib/selectors/server/providers/slack.ts @@ -10,7 +10,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, type ExecuteServerSelectorArgs, diff --git a/apps/sim/lib/selectors/server/providers/snowflake.ts b/apps/sim/lib/selectors/server/providers/snowflake.ts index 3708f047c1e..08ae2520f61 100644 --- a/apps/sim/lib/selectors/server/providers/snowflake.ts +++ b/apps/sim/lib/selectors/server/providers/snowflake.ts @@ -6,7 +6,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/trello.ts b/apps/sim/lib/selectors/server/providers/trello.ts index ebca7959044..01c6375437f 100644 --- a/apps/sim/lib/selectors/server/providers/trello.ts +++ b/apps/sim/lib/selectors/server/providers/trello.ts @@ -4,7 +4,7 @@ import { SelectorConnectionUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, listSelectorResult, diff --git a/apps/sim/lib/selectors/server/providers/wealthbox.ts b/apps/sim/lib/selectors/server/providers/wealthbox.ts index bd23662639f..3dd056fb4ef 100644 --- a/apps/sim/lib/selectors/server/providers/wealthbox.ts +++ b/apps/sim/lib/selectors/server/providers/wealthbox.ts @@ -2,7 +2,7 @@ import type { ServerSelectorKey } from '@/lib/selectors/manifest' import { resolveSelectorOAuthAccessToken } from '@/lib/selectors/server/credentials' import { SelectorConnectionUnavailableError } from '@/lib/selectors/server/errors' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import type { ServerSelectorAttachmentMap } from '@/lib/selectors/server/types' type WealthboxSelectorKey = Extract diff --git a/apps/sim/lib/selectors/server/providers/webflow.ts b/apps/sim/lib/selectors/server/providers/webflow.ts index cbd11b7db59..954d0649f54 100644 --- a/apps/sim/lib/selectors/server/providers/webflow.ts +++ b/apps/sim/lib/selectors/server/providers/webflow.ts @@ -10,7 +10,7 @@ import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-result import { fetchProviderJson, fetchProviderJsonWithStatus, -} from '@/lib/selectors/server/providers/provider-http' +} from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/zoho-desk.ts b/apps/sim/lib/selectors/server/providers/zoho-desk.ts index f6d0e57b20b..f83605a4973 100644 --- a/apps/sim/lib/selectors/server/providers/zoho-desk.ts +++ b/apps/sim/lib/selectors/server/providers/zoho-desk.ts @@ -11,7 +11,7 @@ import { } from '@/lib/selectors/server/errors' import { resolveSelectorCredentialBundle } from '@/lib/selectors/server/providers/credential-bundle' import { flatSelectorResult } from '@/lib/selectors/server/providers/flat-results' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import type { ExecuteServerSelectorArgs, ServerSelectorAttachmentMap, diff --git a/apps/sim/lib/selectors/server/providers/zoom.ts b/apps/sim/lib/selectors/server/providers/zoom.ts index 232114188a5..405aa4c0295 100644 --- a/apps/sim/lib/selectors/server/providers/zoom.ts +++ b/apps/sim/lib/selectors/server/providers/zoom.ts @@ -4,7 +4,7 @@ import { SelectorConnectionUnavailableError, SelectorContextUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJson } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJson } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, listSelectorResult, diff --git a/apps/sim/lib/settings/application/context.ts b/apps/sim/lib/settings/application/context.ts index 939c34d340c..56891e793b7 100644 --- a/apps/sim/lib/settings/application/context.ts +++ b/apps/sim/lib/settings/application/context.ts @@ -1,6 +1,6 @@ import type { DelegatedPrincipal } from '@sim/auth/principal' import { defineAuthorizedWorkspaceUseCase, defineWorkspaceOperation } from '@/lib/core/application' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const settingsContextOperation = defineWorkspaceOperation({ id: 'settings.context', diff --git a/apps/sim/lib/sim-search/search-params.test.ts b/apps/sim/lib/sim-search/params.test.ts similarity index 94% rename from apps/sim/lib/sim-search/search-params.test.ts rename to apps/sim/lib/sim-search/params.test.ts index 94626c402c7..0b03d6773af 100644 --- a/apps/sim/lib/sim-search/search-params.test.ts +++ b/apps/sim/lib/sim-search/params.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { searchSetupParam, searchSetupReturnParam } from '@/lib/sim-search/search-params' +import { searchSetupParam, searchSetupReturnParam } from '@/lib/sim-search/params' describe('Search setup navigation', () => { it('rejects arbitrary redirects and keeps the empty picker value', () => { diff --git a/apps/sim/lib/sim-search/search-params.ts b/apps/sim/lib/sim-search/params.ts similarity index 100% rename from apps/sim/lib/sim-search/search-params.ts rename to apps/sim/lib/sim-search/params.ts diff --git a/apps/sim/lib/sim-search/setup-navigation.ts b/apps/sim/lib/sim-search/setup-navigation.ts index 4c101dc473a..4432b0f84f0 100644 --- a/apps/sim/lib/sim-search/setup-navigation.ts +++ b/apps/sim/lib/sim-search/setup-navigation.ts @@ -1,5 +1,5 @@ import { organizationRoutes } from '@/lib/navigation/paths' -import { searchSetupReturnParam } from '@/lib/sim-search/search-params' +import { searchSetupReturnParam } from '@/lib/sim-search/params' /** Where an organization admin sets up Sim Search sources. */ export function organizationSearchSetupPath(organizationId: string): string { diff --git a/apps/sim/lib/skills/orchestration/index.ts b/apps/sim/lib/skills/orchestration/index.ts index fb69a44492c..0af8c519363 100644 --- a/apps/sim/lib/skills/orchestration/index.ts +++ b/apps/sim/lib/skills/orchestration/index.ts @@ -6,4 +6,4 @@ export { type SkillWriteSource, updateSkill, upsertSkillBatch, -} from './skill-lifecycle' +} from './lifecycle' diff --git a/apps/sim/lib/skills/orchestration/skill-lifecycle.test.ts b/apps/sim/lib/skills/orchestration/lifecycle.test.ts similarity index 99% rename from apps/sim/lib/skills/orchestration/skill-lifecycle.test.ts rename to apps/sim/lib/skills/orchestration/lifecycle.test.ts index b0082d8d4fb..f68666c2d91 100644 --- a/apps/sim/lib/skills/orchestration/skill-lifecycle.test.ts +++ b/apps/sim/lib/skills/orchestration/lifecycle.test.ts @@ -18,7 +18,7 @@ vi.mock('@/lib/workflows/skills/operations', () => ({ deleteSkill: mockDeleteSkill, })) -import { createSkill, updateSkill } from '@/lib/skills/orchestration/skill-lifecycle' +import { createSkill, updateSkill } from '@/lib/skills/orchestration/lifecycle' const WORKSPACE_ID = '11111111-1111-4111-8111-111111111111' const USER_ID = '22222222-2222-4222-8222-222222222222' diff --git a/apps/sim/lib/skills/orchestration/skill-lifecycle.ts b/apps/sim/lib/skills/orchestration/lifecycle.ts similarity index 100% rename from apps/sim/lib/skills/orchestration/skill-lifecycle.ts rename to apps/sim/lib/skills/orchestration/lifecycle.ts diff --git a/apps/sim/lib/speech/application/create-token.ts b/apps/sim/lib/speech/application/create-token.ts index a9f09027186..34fd3eaaffc 100644 --- a/apps/sim/lib/speech/application/create-token.ts +++ b/apps/sim/lib/speech/application/create-token.ts @@ -8,7 +8,7 @@ import { resolveBillingAttribution, resolveOrganizationBillingAttribution, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { recordUsage } from '@/lib/billing/core/usage-log' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application/authorized-workspace-use-case' @@ -19,7 +19,7 @@ import { defineWorkspaceOperation } from '@/lib/core/application/workspace-opera import { env } from '@/lib/core/config/env' import { getCostMultiplier } from '@/lib/core/config/env-flags' import { type ResourceOwner, resourceScopeFromOwner } from '@/lib/core/resource-scope' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('SpeechToken') const ELEVENLABS_TOKEN_URL = 'https://api.elevenlabs.io/v1/single-use-token/realtime_scribe' diff --git a/apps/sim/lib/table/application/analytics.test.ts b/apps/sim/lib/table/application/analytics.test.ts index 675901b523a..bf7f903d197 100644 --- a/apps/sim/lib/table/application/analytics.test.ts +++ b/apps/sim/lib/table/application/analytics.test.ts @@ -13,7 +13,7 @@ const hoisted = vi.hoisted(() => ({ query: vi.fn(), })) vi.mock('@/lib/table/service', () => tableServiceMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/dashboards/feature-flag', () => ({ requireDashboardsEnabled: hoisted.flag })) vi.mock('@/lib/permission-groups/capability-assertions', () => ({ diff --git a/apps/sim/lib/table/application/context.test.ts b/apps/sim/lib/table/application/context.test.ts index 2071127f1ba..75a4e17d13e 100644 --- a/apps/sim/lib/table/application/context.test.ts +++ b/apps/sim/lib/table/application/context.test.ts @@ -6,7 +6,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/table/service', () => tableServiceMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { resolveActiveTableContext, diff --git a/apps/sim/lib/table/application/context.ts b/apps/sim/lib/table/application/context.ts index 08132dcb5e6..561ae94c5e1 100644 --- a/apps/sim/lib/table/application/context.ts +++ b/apps/sim/lib/table/application/context.ts @@ -2,7 +2,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import type { TableAuthorizationContext } from '@/lib/table/application/authorization' import { getTableById } from '@/lib/table/service' import type { TableDefinition } from '@/lib/table/types' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export type TableWorkspaceContext = TableAuthorizationContext diff --git a/apps/sim/lib/table/application/imports.test.ts b/apps/sim/lib/table/application/imports.test.ts index 1de53914352..6627538a7cb 100644 --- a/apps/sim/lib/table/application/imports.test.ts +++ b/apps/sim/lib/table/application/imports.test.ts @@ -59,7 +59,7 @@ vi.mock('@/lib/uploads/upload-session/application', () => ({ vi.mock('@/lib/uploads/upload-session/service', () => uploadSessionMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { markCopilotWorkspaceInvocation } from '@/lib/core/application/copilot-workspace-invocation' import { createCopilotChatPrincipal } from '@/lib/mothership/auth/application-delegation' diff --git a/apps/sim/lib/table/application/imports.ts b/apps/sim/lib/table/application/imports.ts index ba596f1dfb1..aee82052cd0 100644 --- a/apps/sim/lib/table/application/imports.ts +++ b/apps/sim/lib/table/application/imports.ts @@ -37,7 +37,7 @@ import { import { getWorkspaceFile, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { requestOrigin } from '@/lib/uploads/upload-session/application' import { assertUploadSessionAuthBinding, diff --git a/apps/sim/lib/table/application/read-table-snapshot.ts b/apps/sim/lib/table/application/read-table-snapshot.ts index 334466daee5..1fc11183247 100644 --- a/apps/sim/lib/table/application/read-table-snapshot.ts +++ b/apps/sim/lib/table/application/read-table-snapshot.ts @@ -15,7 +15,7 @@ import { resolveTableWorkspaceContext, } from '@/lib/table/application/context' import { tableOperations } from '@/lib/table/application/operations' -import { resolveTableByVfsName } from '@/lib/table/application/table-vfs' +import { resolveTableByVfsName } from '@/lib/table/application/vfs' import { getTableSnapshotModelMountSafety } from '@/lib/table/rows/secret-provenance' import { getOrCreateTableSnapshot, diff --git a/apps/sim/lib/table/application/table-vfs.ts b/apps/sim/lib/table/application/vfs.ts similarity index 100% rename from apps/sim/lib/table/application/table-vfs.ts rename to apps/sim/lib/table/application/vfs.ts diff --git a/apps/sim/lib/table/billing.test.ts b/apps/sim/lib/table/billing.test.ts index 8d196ec71ff..7745db7f1f3 100644 --- a/apps/sim/lib/table/billing.test.ts +++ b/apps/sim/lib/table/billing.test.ts @@ -10,7 +10,7 @@ import { resetEnvFlagsMock, setEnvFlags } from '@sim/testing/mocks/env-flags.moc import { tableConstantsMock, tableConstantsMockFns } from '@sim/testing/mocks/table-constants.mock' import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/plan-helpers', () => billingPlanHelpersMock) vi.mock('@/lib/table/constants', () => tableConstantsMock) diff --git a/apps/sim/lib/table/billing.ts b/apps/sim/lib/table/billing.ts index db9c340a10d..a184233705a 100644 --- a/apps/sim/lib/table/billing.ts +++ b/apps/sim/lib/table/billing.ts @@ -5,7 +5,7 @@ */ import { createLogger } from '@sim/logger' -import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/billing-attribution' +import { resolveWorkspaceBillingPayer } from '@/lib/billing/core/attribution' import { maybeNotifyLimit } from '@/lib/billing/core/limit-notifications' import { getPlanTypeForLimits } from '@/lib/billing/plan-helpers' import { isBillingEnabled } from '@/lib/core/config/env-flags' diff --git a/apps/sim/lib/table/dispatch-concurrency.ts b/apps/sim/lib/table/dispatch-concurrency.ts index dd73b08c4a7..df56eff6628 100644 --- a/apps/sim/lib/table/dispatch-concurrency.ts +++ b/apps/sim/lib/table/dispatch-concurrency.ts @@ -60,7 +60,7 @@ export async function resolveTableDispatchConcurrency(input: { }): Promise { if (!isBillingEnabled) return getTableDispatchConcurrencyLimits().paid const { resolveBillingAttribution, resolveSystemBillingAttribution } = await import( - '@/lib/billing/core/billing-attribution' + '@/lib/billing/core/attribution' ) const attribution = input.actorUserId ? await resolveBillingAttribution({ diff --git a/apps/sim/lib/table/import-provenance.integration.ts b/apps/sim/lib/table/import-provenance.integration.ts index 40ba3e4425c..916e2409dfe 100644 --- a/apps/sim/lib/table/import-provenance.integration.ts +++ b/apps/sim/lib/table/import-provenance.integration.ts @@ -38,7 +38,7 @@ import { markTableJobRunningInWorkspace } from '@/lib/table/jobs/service' import { TableRowProvenanceReader } from '@/lib/table/rows/secret-provenance' import { queryRows } from '@/lib/table/rows/service' import { getTableById } from '@/lib/table/service' -import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { projectResolvedSecretModelContent } from '@/executor/utils/resolved-secret-content-projection' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/table/import-provenance.test.ts b/apps/sim/lib/table/import-provenance.test.ts index 69de5ed771c..ff92791e7d1 100644 --- a/apps/sim/lib/table/import-provenance.test.ts +++ b/apps/sim/lib/table/import-provenance.test.ts @@ -10,7 +10,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/security/encryption', () => encryptionMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/table/import-provenance.ts b/apps/sim/lib/table/import-provenance.ts index 6353d36775e..e07a54fd914 100644 --- a/apps/sim/lib/table/import-provenance.ts +++ b/apps/sim/lib/table/import-provenance.ts @@ -6,7 +6,7 @@ import { createUnknownTableRowSecretProvenance, } from '@/lib/table/rows/secret-provenance' import type { RowData, TableRowSecretProvenanceWrite, TableSchema } from '@/lib/table/types' -import { getStoredFileSecretProvenanceByKey } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { getStoredFileSecretProvenanceByKey } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { isNonIdentifyingSecretLiteral } from '@/executor/utils/resolved-secret-match-policy' import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/table/prestamp-governed-subject.test.ts b/apps/sim/lib/table/prestamp-governed-subject.test.ts index add098a04b6..f021a93ec62 100644 --- a/apps/sim/lib/table/prestamp-governed-subject.test.ts +++ b/apps/sim/lib/table/prestamp-governed-subject.test.ts @@ -17,7 +17,7 @@ vi.mock('@/lib/table/service', () => tableServiceMock) vi.mock('@/lib/table/cell-write', () => ({ writeWorkflowGroupState: hoisted.writeWorkflowGroupState, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/core/async-jobs/config', () => ({ getJobQueue: async () => ({ batchEnqueueAndWait: hoisted.batchEnqueueAndWait }), })) diff --git a/apps/sim/lib/table/rows/row-writes.integration.ts b/apps/sim/lib/table/rows/writes.integration.ts similarity index 100% rename from apps/sim/lib/table/rows/row-writes.integration.ts rename to apps/sim/lib/table/rows/writes.integration.ts diff --git a/apps/sim/lib/table/workflow-columns.test.ts b/apps/sim/lib/table/workflow-columns.test.ts index 07dde872b69..d14b0318e46 100644 --- a/apps/sim/lib/table/workflow-columns.test.ts +++ b/apps/sim/lib/table/workflow-columns.test.ts @@ -52,7 +52,7 @@ const SYSTEM_BILLING_ATTRIBUTION = { payerSubscription: null, } -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/core/async-jobs/config', () => ({ getJobQueue: mockGetJobQueue, diff --git a/apps/sim/lib/table/workflow-columns.ts b/apps/sim/lib/table/workflow-columns.ts index d96d2cb880f..1b0f2d1de9d 100644 --- a/apps/sim/lib/table/workflow-columns.ts +++ b/apps/sim/lib/table/workflow-columns.ts @@ -22,7 +22,7 @@ import { } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { and, asc, eq, gt, inArray, notInArray, or, sql } from 'drizzle-orm' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { EnqueueOptions, WorkflowGroupExecutionCorrelation } from '@/lib/core/async-jobs/types' import { isTriggerDevEnabled } from '@/lib/core/config/env-flags' import { @@ -276,7 +276,7 @@ export async function buildEnqueueItems( assertBillingAttributionSnapshot, resolveBillingAttribution, resolveSystemBillingAttribution, - } = await import('@/lib/billing/core/billing-attribution') + } = await import('@/lib/billing/core/attribution') const attributions = new Map>() const hydratedRuns = await Promise.all( pendingRuns.map(async (runOpts) => { diff --git a/apps/sim/lib/tool-execution/application/execute-tool.test.ts b/apps/sim/lib/tool-execution/application/execute-tool.test.ts index fc13882fb25..0b1f70e7a96 100644 --- a/apps/sim/lib/tool-execution/application/execute-tool.test.ts +++ b/apps/sim/lib/tool-execution/application/execute-tool.test.ts @@ -44,7 +44,7 @@ const hoisted = vi.hoisted(() => ({ executeFileManage: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) @@ -90,7 +90,7 @@ vi.mock('@/lib/internal/file/operations', () => ({ fileContentJsonResponse: vi.fn(), })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) vi.mock('@/lib/billing/core/usage-gate-cache', () => billingUsageGateCacheMock) diff --git a/apps/sim/lib/tool-execution/application/execute-tool.ts b/apps/sim/lib/tool-execution/application/execute-tool.ts index ff672cbcabe..5ab8b32b13c 100644 --- a/apps/sim/lib/tool-execution/application/execute-tool.ts +++ b/apps/sim/lib/tool-execution/application/execute-tool.ts @@ -1,14 +1,14 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' -import { resolveBillingAttribution, toBillingContext } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution, toBillingContext } from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { recordUsage } from '@/lib/billing/core/usage-log' import { isBlockTypeAllowed, loadCatalogWorkspaceContext, resolveCatalogGate, -} from '@/lib/catalog/application/catalog-context' +} from '@/lib/catalog/application/context' import { resolveVisibleToolId, resolveVisibleToolOwners, diff --git a/apps/sim/lib/uploads/archive.test.ts b/apps/sim/lib/uploads/archive.test.ts index 223e04fb66f..4a9f0c0c8d7 100644 --- a/apps/sim/lib/uploads/archive.test.ts +++ b/apps/sim/lib/uploads/archive.test.ts @@ -36,7 +36,7 @@ const { store, mockUpload, mockEnsureFolder } = vi.hoisted(() => ({ mockEnsureFolder: vi.fn(), })) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/workspace-files/application/workspace-file-folders', () => ({ +vi.mock('@/lib/workspace-files/application/folders', () => ({ ensureWorkspaceFileFolderPathOperation: { execute: mockEnsureFolder }, })) vi.mock('@/lib/workspace-files/application/create-workspace-file', () => ({ @@ -44,11 +44,8 @@ vi.mock('@/lib/workspace-files/application/create-workspace-file', () => ({ execute: mockUpload, }, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) import { buildFolderPath, diff --git a/apps/sim/lib/uploads/archive.ts b/apps/sim/lib/uploads/archive.ts index 7762193915a..e6924847366 100644 --- a/apps/sim/lib/uploads/archive.ts +++ b/apps/sim/lib/uploads/archive.ts @@ -6,15 +6,15 @@ import JSZip from 'jszip' import { readZipCentralDirectoryStats } from '@/lib/file-parsers/zip-guard' import { buildFolderPath, FolderPathError } from '@/lib/folders/paths' import { notifyWorkspaceFilesChanged } from '@/lib/realtime/notify' -import { archiveWorkspaceFileFolderIfEmpty } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { archiveWorkspaceFileFolderIfEmpty } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { purgeCreatedWorkspaceFile, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { createWorkspaceFileFromBuffer } from '@/lib/workspace-files/application/create-workspace-file' -import { ensureWorkspaceFileFolderPathOperation } from '@/lib/workspace-files/application/workspace-file-folders' +import { ensureWorkspaceFileFolderPathOperation } from '@/lib/workspace-files/application/folders' import { MAX_WORKSPACE_FILE_BULK_AFFECTED_ITEMS } from '@/lib/workspace-files/limits' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/uploads/client/download.ts b/apps/sim/lib/uploads/client/download.ts index 0f528f75da3..4c6c1d1561f 100644 --- a/apps/sim/lib/uploads/client/download.ts +++ b/apps/sim/lib/uploads/client/download.ts @@ -3,7 +3,7 @@ import { requestRaw } from '@/lib/api/client/request' import { downloadWorkspaceFileItemsContract } from '@/lib/api/contracts/workspace-file-folders' import { exportWorkspaceFileSnapshotContract } from '@/lib/api/contracts/workspace-files' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { isMarkdownFile } from '@/lib/uploads/utils/file-utils' +import { isMarkdownFile } from '@/lib/uploads/utils/file' import { normalizeMimeType } from '@/lib/uploads/utils/mime' /** Action-time content from the mounted viewer, scoped so another file cannot consume it. */ diff --git a/apps/sim/lib/uploads/client/session-upload.ts b/apps/sim/lib/uploads/client/session-upload.ts index ee8c383ac1a..67e968f800a 100644 --- a/apps/sim/lib/uploads/client/session-upload.ts +++ b/apps/sim/lib/uploads/client/session-upload.ts @@ -19,7 +19,7 @@ import { } from '@/lib/api/contracts/upload-sessions' import type { UploadProgressEvent } from '@/lib/uploads/client/types' import { uploadFileSession } from '@/lib/uploads/client/upload-session' -import { getFileContentType } from '@/lib/uploads/utils/file-utils' +import { getFileContentType } from '@/lib/uploads/utils/file' interface UploadWorkspaceFileSessionParams { workspaceId: string diff --git a/apps/sim/lib/uploads/client/upload-session.ts b/apps/sim/lib/uploads/client/upload-session.ts index f741670d598..2c47cb18e3c 100644 --- a/apps/sim/lib/uploads/client/upload-session.ts +++ b/apps/sim/lib/uploads/client/upload-session.ts @@ -9,7 +9,7 @@ import type { } from '@/lib/api/contracts/v2/uploads' import { runWithConcurrency } from '@/lib/uploads/client/concurrency' import type { UploadProgressEvent } from '@/lib/uploads/client/types' -import { isAbortError } from '@/lib/uploads/utils/file-utils' +import { isAbortError } from '@/lib/uploads/utils/file' const BASE_TIMEOUT_MS = 2 * 60 * 1000 const TIMEOUT_PER_MB_MS = 1500 diff --git a/apps/sim/lib/uploads/contexts/chat/chat-file-manager.ts b/apps/sim/lib/uploads/contexts/chat/file-manager.ts similarity index 100% rename from apps/sim/lib/uploads/contexts/chat/chat-file-manager.ts rename to apps/sim/lib/uploads/contexts/chat/file-manager.ts diff --git a/apps/sim/lib/uploads/contexts/chat/index.ts b/apps/sim/lib/uploads/contexts/chat/index.ts index dffee2fee96..84473dba4ba 100644 --- a/apps/sim/lib/uploads/contexts/chat/index.ts +++ b/apps/sim/lib/uploads/contexts/chat/index.ts @@ -1 +1 @@ -export { processChatFiles } from './chat-file-manager' +export { processChatFiles } from './file-manager' diff --git a/apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.test.ts b/apps/sim/lib/uploads/contexts/copilot/file-manager.test.ts similarity index 98% rename from apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.test.ts rename to apps/sim/lib/uploads/contexts/copilot/file-manager.test.ts index d8af7f9d57e..862632be215 100644 --- a/apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.test.ts +++ b/apps/sim/lib/uploads/contexts/copilot/file-manager.test.ts @@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot/copilot-file-manager' +import { uploadCopilotFile } from '@/lib/uploads/contexts/copilot/file-manager' import type { UploadFileOptions } from '@/lib/uploads/shared/types' const mockUploadFile = storageServiceMockFns.mockUploadFile diff --git a/apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.ts b/apps/sim/lib/uploads/contexts/copilot/file-manager.ts similarity index 100% rename from apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.ts rename to apps/sim/lib/uploads/contexts/copilot/file-manager.ts diff --git a/apps/sim/lib/uploads/contexts/copilot/index.ts b/apps/sim/lib/uploads/contexts/copilot/index.ts index 5fdfc829dc4..094f0701036 100644 --- a/apps/sim/lib/uploads/contexts/copilot/index.ts +++ b/apps/sim/lib/uploads/contexts/copilot/index.ts @@ -1,5 +1,5 @@ -export type { CopilotStoredFile } from './copilot-file-manager' +export type { CopilotStoredFile } from './file-manager' export { downloadCopilotFile, uploadCopilotFile, -} from './copilot-file-manager' +} from './file-manager' diff --git a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.test.ts b/apps/sim/lib/uploads/contexts/execution/file-manager.test.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/execution/execution-file-manager.test.ts rename to apps/sim/lib/uploads/contexts/execution/file-manager.test.ts index 40d4555e607..695ba6a6dd4 100644 --- a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.test.ts +++ b/apps/sim/lib/uploads/contexts/execution/file-manager.test.ts @@ -22,7 +22,7 @@ vi.mock('@/lib/uploads/providers/s3/client', () => ({ })) import { processExecutionFiles } from '@/lib/execution/files' -import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-manager' +import { uploadExecutionFile } from '@/lib/uploads/contexts/execution/file-manager' setUploadsConfig({ USE_S3_STORAGE: true }) uploadsConfigMockFns.mockGetStorageConfig.mockReturnValue({ bucket: 'bucket', region: 'us-east-1' }) diff --git a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts b/apps/sim/lib/uploads/contexts/execution/file-manager.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts rename to apps/sim/lib/uploads/contexts/execution/file-manager.ts index ae93dafc041..9a5c677db23 100644 --- a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts +++ b/apps/sim/lib/uploads/contexts/execution/file-manager.ts @@ -12,7 +12,7 @@ import { import { initializeWorkspaceFileSecretProvenanceInTx, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { deleteFileMetadata, deleteFileMetadataByIdentity, diff --git a/apps/sim/lib/uploads/contexts/execution/index.ts b/apps/sim/lib/uploads/contexts/execution/index.ts index 20b2c1b79bf..7f62c13d2f5 100644 --- a/apps/sim/lib/uploads/contexts/execution/index.ts +++ b/apps/sim/lib/uploads/contexts/execution/index.ts @@ -1,2 +1,2 @@ -export * from './execution-file-manager' +export * from './file-manager' export * from './utils' diff --git a/apps/sim/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager.ts b/apps/sim/lib/uploads/contexts/knowledge-base/file-manager.ts similarity index 100% rename from apps/sim/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager.ts rename to apps/sim/lib/uploads/contexts/knowledge-base/file-manager.ts diff --git a/apps/sim/lib/uploads/contexts/organization-assistant/application.ts b/apps/sim/lib/uploads/contexts/organization-assistant/application.ts index 3f35a04e310..70df6ccf20e 100644 --- a/apps/sim/lib/uploads/contexts/organization-assistant/application.ts +++ b/apps/sim/lib/uploads/contexts/organization-assistant/application.ts @@ -18,7 +18,7 @@ import { } from '@/lib/uploads/shared/assistant-images' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { createUploadSession, type UploadSessionRecord } from '@/lib/uploads/upload-session/service' -import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' const organizationAttachmentOperation = defineOrganizationOperation({ diff --git a/apps/sim/lib/uploads/contexts/workspace/__integration__/creator-lifetime.integration.ts b/apps/sim/lib/uploads/contexts/workspace/__integration__/creator-lifetime.integration.ts index 8ded5b7ec10..914425b8a06 100644 --- a/apps/sim/lib/uploads/contexts/workspace/__integration__/creator-lifetime.integration.ts +++ b/apps/sim/lib/uploads/contexts/workspace/__integration__/creator-lifetime.integration.ts @@ -28,14 +28,14 @@ import { createWorkspaceFileFolder, listFileFolders, listWorkspaceFileFolders, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { fetchWorkspaceFileBuffer, getWorkspaceFile, updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { queryWorkspaceFileVersions } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { queryWorkspaceFileVersions } from '@/lib/uploads/contexts/workspace/file-version-store' import { deleteUserAccount } from '@/lib/users/account-deletion' import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata' import { revokeWorkspaceAccessTx } from '@/lib/workspaces/access/workspace-access' diff --git a/apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts b/apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts index 11b6a381928..c3037cced52 100644 --- a/apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts +++ b/apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts @@ -43,7 +43,7 @@ import { moveWorkspaceFileItems, updateWorkspaceFileFolder, workspaceFileNameFolderCondition, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { deleteWorkspaceFile, fetchWorkspaceFileBuffer, @@ -56,7 +56,7 @@ import { trackChatUpload, uploadWorkspaceFile, workspaceFileVfsPath, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { normalizeDisplaySegment } from '@/lib/vfs/path' import { createWorkspaceFileDelegatedPrincipal } from '@/lib/workspace-files/application/delegated-principal' import { restoreWorkspaceFileOperation } from '@/lib/workspace-files/application/restore-workspace-file' diff --git a/apps/sim/lib/uploads/contexts/workspace/__integration__/file-versions.integration.ts b/apps/sim/lib/uploads/contexts/workspace/__integration__/file-versions.integration.ts index 53160ab84fd..e61c1224c8b 100644 --- a/apps/sim/lib/uploads/contexts/workspace/__integration__/file-versions.integration.ts +++ b/apps/sim/lib/uploads/contexts/workspace/__integration__/file-versions.integration.ts @@ -42,7 +42,6 @@ import { import { runCli } from '@/lib/mothership/agent-cli/run-cli' import { createAgentCliTransport } from '@/lib/mothership/agent-cli/transport' import { handoffFileCreatorsInTx } from '@/lib/uploads/contexts/workspace/creator-handoff' -import { WORKSPACE_FILE_STORAGE_CLEANUP_OUTBOX_EVENT } from '@/lib/uploads/contexts/workspace/file-outbox-events' import { createOwnedWorkspaceFile, deleteWorkspaceFileVersion, @@ -52,19 +51,20 @@ import { purgeCreatedWorkspaceFile, updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { WORKSPACE_FILE_STORAGE_CLEANUP_OUTBOX_EVENT } from '@/lib/uploads/contexts/workspace/file-outbox-events' import { replaceWorkspaceFileSecretProvenanceInTx, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import * as storageCleanup from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import * as storageCleanup from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { getCurrentWorkspaceFileVersion, getWorkspaceFileVersion, getWorkspaceFileVersionProvenance, queryWorkspaceFileVersions, releaseWorkspaceFileVersionsForPurgeInTx, -} from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-version-store' import * as storageService from '@/lib/uploads/core/storage-service' import { revertWorkspaceFileVersion } from '@/lib/workspace-files/application/file-versions' import { revokeWorkspaceAccessTx } from '@/lib/workspaces/access/workspace-access' diff --git a/apps/sim/lib/uploads/contexts/workspace/__integration__/storage-lock-order.integration.ts b/apps/sim/lib/uploads/contexts/workspace/__integration__/storage-lock-order.integration.ts index d0741beb130..2ed98fff31a 100644 --- a/apps/sim/lib/uploads/contexts/workspace/__integration__/storage-lock-order.integration.ts +++ b/apps/sim/lib/uploads/contexts/workspace/__integration__/storage-lock-order.integration.ts @@ -34,12 +34,12 @@ import { createKnowledgeAclFixtureIds, seedKnowledgeAclFixture, } from '@/lib/knowledge/__integration__/seed-source-access-fixture' -import { bulkArchiveWorkspaceFileItems } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { bulkArchiveWorkspaceFileItems } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { generateWorkspaceFileKey, registerUploadedWorkspaceFile, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { uploadFile } from '@/lib/uploads/core/storage-service' import { lockFileDirectories } from '@/lib/workspace-files/locks' diff --git a/apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts b/apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts index 5dce2c8360f..947b59e9b48 100644 --- a/apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts +++ b/apps/sim/lib/uploads/contexts/workspace/creator-handoff.ts @@ -1,12 +1,12 @@ import { workspaceFiles } from '@sim/db/schema' import { asc, inArray, type SQL } from 'drizzle-orm' import type { DbTransaction } from '@/lib/db/types' -import { snapshotWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { snapshotWorkspaceFileSecretProvenanceInTx } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { isVersionHeadCurrent, loadWorkspaceFileVersionHeads, materializeWorkspaceFileVersionInTx, -} from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-version-store' /** Freezes implicit history under the writer lock before replacing a shared file's live creator. */ export async function handoffFileCreatorsInTx( diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-folder-manager.test.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-folder-manager.test.ts index d3b04981506..998d96940d7 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-folder-manager.test.ts @@ -27,7 +27,7 @@ import { normalizeWorkspaceFileItemName, relocateWorkspaceFileFolderByPath, WorkspaceFileFolderConflictError, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' describe('workspace file folder paths', () => { it('builds nested paths from parent relationships', () => { diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts b/apps/sim/lib/uploads/contexts/workspace/file-folder-manager.ts similarity index 100% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts rename to apps/sim/lib/uploads/contexts/workspace/file-folder-manager.ts diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.test.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.test.ts index 750b238e9e5..8da41ddf99c 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.test.ts @@ -8,8 +8,8 @@ vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) import type { OutboxEventContext } from '@/lib/core/outbox/service' +import { workspaceFileLiveDocOutboxHandlers } from '@/lib/uploads/contexts/workspace/file-live-doc-outbox' import { WORKSPACE_FILE_LIVE_DOC_OUTBOX_EVENT } from '@/lib/uploads/contexts/workspace/file-outbox-events' -import { workspaceFileLiveDocOutboxHandlers } from '@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox' const mockDownloadFile = storageServiceMockFns.mockDownloadFile diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.ts b/apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.ts similarity index 98% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.ts rename to apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.ts index 287f8bb8ec5..c46dc2e3151 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-live-doc-outbox.ts @@ -13,7 +13,7 @@ import { import { applyEditToLiveFileDoc, invalidateLiveFileDoc } from '@/lib/realtime/notify' import { WORKSPACE_FILE_LIVE_DOC_OUTBOX_EVENT } from '@/lib/uploads/contexts/workspace/file-outbox-events' import { downloadFile } from '@/lib/uploads/core/storage-service' -import { isMarkdownFile } from '@/lib/uploads/utils/file-utils' +import { isMarkdownFile } from '@/lib/uploads/utils/file' import { type FileOwnerAdapters, requireFileOwnerAdapter, diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-download.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-manager-download.test.ts similarity index 93% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-download.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-manager-download.test.ts index 1589cd4f6b6..1a3fc6e36fa 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-download.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-manager-download.test.ts @@ -13,16 +13,13 @@ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) import { assertKnownSizeWithinLimit, isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { fetchWorkspaceFileBuffer, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' workspaceFileFoldersMockFns.mockBuildWorkspaceFileFolderPathMap.mockImplementation(() => new Map()) workspaceFileFoldersMockFns.mockNormalizeWorkspaceFileItemName.mockImplementation( diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-errors.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-manager-errors.test.ts similarity index 97% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-errors.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-manager-errors.test.ts index d735e9b5725..c9a8507b06f 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-errors.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-manager-errors.test.ts @@ -1,6 +1,6 @@ import { dbChainMockFns, queueTableRows, resetDbChainMock, schemaMock } from '@sim/testing' import { afterAll, beforeEach, describe, expect, it } from 'vitest' -import { listWorkspaceFiles } from './workspace-file-manager' +import { listWorkspaceFiles } from './file-manager' afterAll(resetDbChainMock) diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-manager-page.test.ts similarity index 95% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-manager-page.test.ts index 22634ad4b9b..cea39a3e947 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-manager-page.test.ts @@ -16,13 +16,10 @@ vi.mock('@/lib/folders/locks', () => ({ acquireFolderMutationLock: vi.fn() })) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) import { createWorkspaceFileBodySchema } from '@/lib/api/contracts/workspace-files' -import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { uploadWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { compileSimPage, SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' workspaceFileFoldersMockFns.mockBuildWorkspaceFileFolderPathMap.mockImplementation(() => new Map()) diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-manager.test.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-manager.test.ts index aa66a5b9b95..695f5aaeb41 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-manager.test.ts @@ -4,7 +4,7 @@ import { findWorkspaceFileRecord, generateWorkspaceFileKey, type WorkspaceFileRecord, -} from './workspace-file-manager' +} from './file-manager' const FILE_ID = 'ec28e5d5-898a-48f0-aa6f-2fd7427c9563' diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts b/apps/sim/lib/uploads/contexts/workspace/file-manager.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts rename to apps/sim/lib/uploads/contexts/workspace/file-manager.ts index 01a4605b483..43764393a6e 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-manager.ts @@ -50,7 +50,7 @@ import { CollabDocStateConflictError, type PreparedCollabDocState, saveCollabDocStateInTx, -} from '@/lib/collab-doc/collab-state' +} from '@/lib/collab-doc/state' import { asOrchestrationError, OrchestrationError } from '@/lib/core/orchestration/types' import { generateRequestId } from '@/lib/core/utils/request' import { generateRestoreName } from '@/lib/core/utils/restore-name' @@ -64,8 +64,8 @@ import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils' import { lockWorkspaceProject } from '@/lib/projects/membership' import { notifyWorkspaceFilesChanged } from '@/lib/realtime/notify' import { getServePathPrefix } from '@/lib/uploads' -import type { WorkspaceFileFolderRecord } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' -import { enqueueWorkspaceFileLiveDocReconciliation } from '@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox' +import type { WorkspaceFileFolderRecord } from '@/lib/uploads/contexts/workspace/file-folder-manager' +import { enqueueWorkspaceFileLiveDocReconciliation } from '@/lib/uploads/contexts/workspace/file-live-doc-outbox' import { applyWorkspaceFileSecretProvenancePolicyInTx, EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE, @@ -74,11 +74,11 @@ import { snapshotWorkspaceFileSecretProvenanceInTx, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenancePolicy, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { enqueueWorkspaceFileStorageCleanups, processWorkspaceFileStorageCleanupsNow, -} from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +} from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { currentWorkspaceFileVersionNumberSql, deleteWorkspaceFileVersionInTx, @@ -88,7 +88,7 @@ import { recordWorkspaceFileVersionInTx, type WorkspaceFileVersionDeletion, type WorkspaceFileVersionWrite, -} from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-version-store' import { buildStorageKeySegment } from '@/lib/uploads/core/storage-key' import { deleteFile, @@ -99,8 +99,8 @@ import { } from '@/lib/uploads/core/storage-service' import { finishFileContentEffects } from '@/lib/uploads/server/content-effects' import { getWorkspaceFileSize, MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types' -import { isMarkdownFile } from '@/lib/uploads/utils/file-utils' -import type { ServableFile } from '@/lib/uploads/utils/file-utils.server' +import { isMarkdownFile } from '@/lib/uploads/utils/file' +import type { ServableFile } from '@/lib/uploads/utils/file.server' import { decodeVfsPathSegments, displaySegmentPattern, @@ -146,7 +146,7 @@ import { resolveFileFolderTarget, resolveWorkspaceFileFolderTarget, workspaceFileNameFolderCondition, -} from './workspace-file-folder-manager' +} from './file-folder-manager' const logger = createLogger('WorkspaceFileStorage') @@ -2334,7 +2334,7 @@ export async function fetchServableWorkspaceFileBuffer( fileRecord: WorkspaceFileRecord, options: { maxBytes: number; signal?: AbortSignal; requestId?: string } ): Promise { - const { downloadServableFileFromStorage } = await import('@/lib/uploads/utils/file-utils.server') + const { downloadServableFileFromStorage } = await import('@/lib/uploads/utils/file.server') return downloadServableFileFromStorage( { diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-query.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-query.test.ts similarity index 96% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-query.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-query.test.ts index 572b356b5dc..6a24cb4b6cf 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-query.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-query.test.ts @@ -24,15 +24,12 @@ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) import { listWorkspaceFiles, queryWorkspaceFiles, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' uploadsMockFns.mockGetServePathPrefix.mockImplementation(() => '/api/files/serve/s3/') diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-reference.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-reference.test.ts similarity index 95% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-reference.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-reference.test.ts index c13b773d230..e3485b7f6d8 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-reference.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-reference.test.ts @@ -23,10 +23,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/billing/storage', () => billingStorageMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-versions', async (importOriginal) => ({ - ...(await importOriginal< - typeof import('@/lib/uploads/contexts/workspace/workspace-file-versions') - >()), +vi.mock('@/lib/uploads/contexts/workspace/file-version-store', async (importOriginal) => ({ + ...(await importOriginal()), currentWorkspaceFileVersionNumberSql: vi.fn(() => ({ versionProjection: true })), })) @@ -34,16 +32,13 @@ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) import { listWorkspaceFiles, parseChatUploadReference, resolveWorkspaceFileReference, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' uploadsMockFns.mockGetServePathPrefix.mockImplementation(() => '/api/files/serve/s3/') workspaceFileFoldersMockFns.mockFindWorkspaceFileFolderIdByPath.mockResolvedValue(null) diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.test.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.test.ts index 72ddda46dec..a45b0a0191c 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.test.ts @@ -8,7 +8,7 @@ const { mockReportWrite, mockReportRefusal, mockFindWorkspaceFileVersionKeys } = mockFindWorkspaceFileVersionKeys: vi.fn(async () => new Set()), })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-versions', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-version-store', () => ({ findWorkspaceFileVersionKeys: mockFindWorkspaceFileVersionKeys, })) @@ -35,7 +35,7 @@ import { mergeWorkspaceFileSecretProvenance, preserveWorkspaceFileSecretProvenanceInTx, replaceWorkspaceFileSecretProvenanceInTx, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry' const CONTENT_UPDATED_AT = new Date('2026-08-04T00:00:00.000Z') diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.ts b/apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.ts rename to apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.ts index f94f57d8a0d..d31282b58da 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.ts @@ -23,7 +23,7 @@ import { PROVENANCE_MAX_ENTRIES, PROVENANCE_MAX_SERIALIZED_BYTES, } from '@/lib/execution/provenance-limits' -import { findWorkspaceFileVersionKeys } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import { findWorkspaceFileVersionKeys } from '@/lib/uploads/contexts/workspace/file-version-store' import type { OwnedFileContext } from '@/lib/workspace-files/owned-files' import { OWNED_FILE_CONTEXTS } from '@/lib/workspace-files/owned-files' import { diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-accounting.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-storage-accounting.test.ts similarity index 98% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-accounting.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-storage-accounting.test.ts index 0ebfce493cb..7c98cfc5e5b 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-accounting.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-storage-accounting.test.ts @@ -37,17 +37,17 @@ const { mockRecordWorkspaceFileVersionInTx: vi.fn(), })) -vi.mock('@/lib/collab-doc/collab-state', () => ({ +vi.mock('@/lib/collab-doc/state', () => ({ CollabDocStateConflictError: class extends Error {}, saveCollabDocStateInTx: mockSaveCollabDocStateInTx, })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-versions', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-version-store', () => ({ isVersionHeadCurrent: vi.fn(() => false), listWorkspaceFileVersionKeysInTx: vi.fn(async () => []), loadWorkspaceFileVersionHead: vi.fn(async () => undefined), @@ -58,7 +58,7 @@ vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) vi.mock('@/lib/projects/membership', () => projectMembershipMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-live-doc-outbox', () => ({ enqueueWorkspaceFileLiveDocReconciliation: mockEnqueueWorkspaceFileLiveDocReconciliation, processWorkspaceFileLiveDocReconciliationNow: mockProcessWorkspaceFileLiveDocReconciliationNow, })) @@ -69,15 +69,12 @@ vi.mock('@/lib/uploads', () => uploadsMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox', () => ({ enqueueWorkspaceFileStorageCleanups: mockEnqueueWorkspaceFileStorageCleanups, processWorkspaceFileStorageCleanupsNow: mockProcessWorkspaceFileStorageCleanupsNow, })) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) vi.mock('@/lib/folders/locks', () => ({ acquireFolderMutationLock: mockAcquireFolderMutationLock, @@ -87,10 +84,7 @@ vi.mock('@/lib/folders/queries', () => folderQueriesMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -import { - CollabDocStateConflictError, - type PreparedCollabDocState, -} from '@/lib/collab-doc/collab-state' +import { CollabDocStateConflictError, type PreparedCollabDocState } from '@/lib/collab-doc/state' import { ContentVersionConflictError, deleteWorkspaceFile, @@ -99,7 +93,7 @@ import { restoreWorkspaceFile, updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' const mockLoadActiveFolderPathIndex = folderQueriesMockFns.mockLoadActiveFolderPathIndex const mockResolveFolderPathFromIndex = folderQueriesMockFns.mockResolveFolderPathFromIndex diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.test.ts b/apps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.test.ts similarity index 97% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.test.ts rename to apps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.test.ts index 7f2886d2948..19a0e9fd383 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.test.ts @@ -20,7 +20,7 @@ import { enqueueWorkspaceFileStorageCleanups, processWorkspaceFileStorageCleanupsNow, workspaceFileStorageCleanupOutboxHandlers, -} from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +} from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' const mockDeleteFile = storageServiceMockFns.mockDeleteFile diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.ts b/apps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.ts similarity index 100% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.ts rename to apps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.ts diff --git a/apps/sim/lib/uploads/contexts/workspace/workspace-file-versions.ts b/apps/sim/lib/uploads/contexts/workspace/file-version-store.ts similarity index 99% rename from apps/sim/lib/uploads/contexts/workspace/workspace-file-versions.ts rename to apps/sim/lib/uploads/contexts/workspace/file-version-store.ts index 5ae14a0949e..a5844e4d9e7 100644 --- a/apps/sim/lib/uploads/contexts/workspace/workspace-file-versions.ts +++ b/apps/sim/lib/uploads/contexts/workspace/file-version-store.ts @@ -19,9 +19,9 @@ import { resumeKeyset, } from '@/lib/api/list-query' import type { DbOrTx, DbTransaction } from '@/lib/db/types' -import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenanceSnapshot } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenanceSnapshot } from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { enqueueWorkspaceFileStorageCleanups } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' import { getWorkspaceFileSize } from '@/lib/uploads/shared/types' import { resolveFileOwner } from '@/lib/workspace-files/ownership' diff --git a/apps/sim/lib/uploads/contexts/workspace/index.ts b/apps/sim/lib/uploads/contexts/workspace/index.ts index b7dbcdee264..833f9cf0b70 100644 --- a/apps/sim/lib/uploads/contexts/workspace/index.ts +++ b/apps/sim/lib/uploads/contexts/workspace/index.ts @@ -1,2 +1,2 @@ -export * from './workspace-file-folder-manager' -export * from './workspace-file-manager' +export * from './file-folder-manager' +export * from './file-manager' diff --git a/apps/sim/lib/uploads/contexts/workspace/track-chat-upload.test.ts b/apps/sim/lib/uploads/contexts/workspace/track-chat-upload.test.ts index 9b4aeb65ba7..6164149d7b9 100644 --- a/apps/sim/lib/uploads/contexts/workspace/track-chat-upload.test.ts +++ b/apps/sim/lib/uploads/contexts/workspace/track-chat-upload.test.ts @@ -12,11 +12,11 @@ vi.mock('@/lib/billing/storage', () => billingStorageMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) -import { suffixedName, trackChatUpload } from './workspace-file-manager' +import { suffixedName, trackChatUpload } from './file-manager' const mockReplaceWorkspaceFileSecretProvenanceInTx = workspaceFileSecretProvenanceMockFns.mockReplaceWorkspaceFileSecretProvenanceInTx diff --git a/apps/sim/lib/uploads/core/storage-key.test.ts b/apps/sim/lib/uploads/core/storage-key.test.ts index 7a5f344378f..58bd4e72249 100644 --- a/apps/sim/lib/uploads/core/storage-key.test.ts +++ b/apps/sim/lib/uploads/core/storage-key.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' import { generateUniqueExecutionFileKey } from '@/lib/uploads/contexts/execution/utils' -import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager' +import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/file-manager' import { buildStorageKeySegment, LOCAL_UPLOAD_METADATA_SUFFIX, diff --git a/apps/sim/lib/uploads/core/storage-service.ts b/apps/sim/lib/uploads/core/storage-service.ts index 12720253838..17972c0ee5c 100644 --- a/apps/sim/lib/uploads/core/storage-service.ts +++ b/apps/sim/lib/uploads/core/storage-service.ts @@ -26,7 +26,7 @@ import type { StoredObjectInfo, UploadFileOptions, } from '@/lib/uploads/shared/types' -import { sanitizeFileKey } from '@/lib/uploads/utils/file-utils' +import { sanitizeFileKey } from '@/lib/uploads/utils/file' const logger = createLogger('StorageService') let localStorageSetup: Promise | undefined diff --git a/apps/sim/lib/uploads/documents/compile.ts b/apps/sim/lib/uploads/documents/compile.ts index 22ffa7f37e3..915e2ee123a 100644 --- a/apps/sim/lib/uploads/documents/compile.ts +++ b/apps/sim/lib/uploads/documents/compile.ts @@ -11,7 +11,7 @@ import { type SandboxFile, } from '@/lib/execution/remote-sandbox' import { runSandboxTask } from '@/lib/execution/sandbox/run-task' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { DocCompileUserError } from '@/lib/uploads/documents/compile-error' import { type CompiledDocReadOptions, @@ -28,14 +28,14 @@ import { type DocumentSourceLanguage, iterateDocumentFileReferences, } from '@/lib/uploads/documents/references' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import { admitWorkspaceFiles, workspaceFileProvenanceIdentity, } from '@/lib/workspace-files/application/admit-file-content' import { readWorkspaceFileContent } from '@/lib/workspace-files/application/read-workspace-file-content' import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata' -import type { SandboxTaskId } from '@/sandbox-tasks/registry' +import type { SandboxTaskId } from '@/sandboxes/registry' const logger = createLogger('CopilotDocCompile') diff --git a/apps/sim/lib/uploads/documents/compiled-store.ts b/apps/sim/lib/uploads/documents/compiled-store.ts index 94267aa3b84..061224a20ac 100644 --- a/apps/sim/lib/uploads/documents/compiled-store.ts +++ b/apps/sim/lib/uploads/documents/compiled-store.ts @@ -5,7 +5,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage, toError } from '@sim/utils/errors' import { z } from 'zod' import { assertKnownSizeWithinLimit, isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { isObjectNotFoundError } from '@/lib/uploads/core/errors' import { downloadFile, uploadFile } from '@/lib/uploads/core/storage-service' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' diff --git a/apps/sim/lib/uploads/documents/render.ts b/apps/sim/lib/uploads/documents/render.ts index cbd852bdf2e..b4dbd269e40 100644 --- a/apps/sim/lib/uploads/documents/render.ts +++ b/apps/sim/lib/uploads/documents/render.ts @@ -1,7 +1,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { docNotReadyMessage, isDocNotReadyError } from '@/lib/uploads/utils/doc-not-ready' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' /** Preserves retryable generation and output-size errors across authorized artifact readers. */ export async function resolveDocumentRender( diff --git a/apps/sim/lib/uploads/providers/blob/client.test.ts b/apps/sim/lib/uploads/providers/blob/client.test.ts index a457e8f919e..5e41f9a5225 100644 --- a/apps/sim/lib/uploads/providers/blob/client.test.ts +++ b/apps/sim/lib/uploads/providers/blob/client.test.ts @@ -60,7 +60,7 @@ import { parseConnectionString, uploadToBlob, } from '@/lib/uploads/providers/blob/client' -import { sanitizeFilenameForMetadata } from '@/lib/uploads/utils/file-utils' +import { sanitizeFilenameForMetadata } from '@/lib/uploads/utils/file' setUploadsConfig({ BLOB_CONFIG: { diff --git a/apps/sim/lib/uploads/providers/blob/client.ts b/apps/sim/lib/uploads/providers/blob/client.ts index 3a42ccbf43d..a1f4397b8a0 100644 --- a/apps/sim/lib/uploads/providers/blob/client.ts +++ b/apps/sim/lib/uploads/providers/blob/client.ts @@ -19,7 +19,7 @@ import type { MultipartCompletionPolicy, StoredObjectInfo, } from '@/lib/uploads/shared/types' -import { sanitizeStorageMetadata } from '@/lib/uploads/utils/file-utils' +import { sanitizeStorageMetadata } from '@/lib/uploads/utils/file' import { sanitizeFileName } from '@/executor/constants' const logger = createLogger('BlobClient') diff --git a/apps/sim/lib/uploads/providers/google-cloud-storage/client.ts b/apps/sim/lib/uploads/providers/google-cloud-storage/client.ts index 5dfa7c0cfca..64e8849fcbd 100644 --- a/apps/sim/lib/uploads/providers/google-cloud-storage/client.ts +++ b/apps/sim/lib/uploads/providers/google-cloud-storage/client.ts @@ -21,10 +21,7 @@ import type { MultipartCompletionPolicy, StoredObjectInfo, } from '@/lib/uploads/shared/types' -import { - sanitizeFilenameForMetadata, - sanitizeStorageMetadata, -} from '@/lib/uploads/utils/file-utils' +import { sanitizeFilenameForMetadata, sanitizeStorageMetadata } from '@/lib/uploads/utils/file' import { sanitizeFileName } from '@/executor/constants' const logger = createLogger('GcsClient') diff --git a/apps/sim/lib/uploads/providers/s3/client.ts b/apps/sim/lib/uploads/providers/s3/client.ts index ca5ad061dab..f072664d4cc 100644 --- a/apps/sim/lib/uploads/providers/s3/client.ts +++ b/apps/sim/lib/uploads/providers/s3/client.ts @@ -33,10 +33,7 @@ import type { MultipartCompletionPolicy, StoredObjectInfo, } from '@/lib/uploads/shared/types' -import { - sanitizeFilenameForMetadata, - sanitizeStorageMetadata, -} from '@/lib/uploads/utils/file-utils' +import { sanitizeFilenameForMetadata, sanitizeStorageMetadata } from '@/lib/uploads/utils/file' import { sanitizeFileName } from '@/executor/constants' let _s3Client: S3Client | null = null diff --git a/apps/sim/lib/uploads/server/content-effects.test.ts b/apps/sim/lib/uploads/server/content-effects.test.ts index 8efbeaae89f..f64a8a8d49a 100644 --- a/apps/sim/lib/uploads/server/content-effects.test.ts +++ b/apps/sim/lib/uploads/server/content-effects.test.ts @@ -4,10 +4,10 @@ const mocks = vi.hoisted(() => ({ cleanup: vi.fn(), reconcile: vi.fn(), })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox', () => ({ processWorkspaceFileStorageCleanupsNow: mocks.cleanup, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-live-doc-outbox', () => ({ processWorkspaceFileLiveDocReconciliationNow: mocks.reconcile, })) diff --git a/apps/sim/lib/uploads/server/content-effects.ts b/apps/sim/lib/uploads/server/content-effects.ts index 797ab45f71b..3d590af4d4d 100644 --- a/apps/sim/lib/uploads/server/content-effects.ts +++ b/apps/sim/lib/uploads/server/content-effects.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { describeError } from '@sim/utils/errors' -import { processWorkspaceFileLiveDocReconciliationNow } from '@/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox' -import { processWorkspaceFileStorageCleanupsNow } from '@/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox' +import { processWorkspaceFileLiveDocReconciliationNow } from '@/lib/uploads/contexts/workspace/file-live-doc-outbox' +import { processWorkspaceFileStorageCleanupsNow } from '@/lib/uploads/contexts/workspace/file-storage-cleanup-outbox' const logger = createLogger('FileContentEffects') diff --git a/apps/sim/lib/uploads/server/markdown-export.ts b/apps/sim/lib/uploads/server/markdown-export.ts index 7c2f42a7dd4..f60a205b8cc 100644 --- a/apps/sim/lib/uploads/server/markdown-export.ts +++ b/apps/sim/lib/uploads/server/markdown-export.ts @@ -13,7 +13,7 @@ import { MATERIALIZE_CONCURRENCY, mapWithConcurrency } from '@/lib/core/utils/co import type { StorageContext } from '@/lib/uploads/config' import { downloadFile } from '@/lib/uploads/core/storage-service' import { extractEmbeddedFileRef } from '@/lib/uploads/utils/embedded-image-ref' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' import { splitFrontmatter } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/markdown-fidelity' const logger = createLogger('MarkdownExport') diff --git a/apps/sim/lib/uploads/server/metadata.ts b/apps/sim/lib/uploads/server/metadata.ts index 68ead271692..c1c1de20a9a 100644 --- a/apps/sim/lib/uploads/server/metadata.ts +++ b/apps/sim/lib/uploads/server/metadata.ts @@ -9,7 +9,7 @@ import { isWorkspaceScopedContext, type StorageContext, } from '@/lib/uploads/shared/types' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' const logger = createLogger('FileMetadata') diff --git a/apps/sim/lib/uploads/upload-session/application.ts b/apps/sim/lib/uploads/upload-session/application.ts index b70edafafb7..56f34253da7 100644 --- a/apps/sim/lib/uploads/upload-session/application.ts +++ b/apps/sim/lib/uploads/upload-session/application.ts @@ -12,7 +12,7 @@ import { createOrganizationLogoUpload, } from '@/lib/uploads/contexts/organization-logo/application' import { getWorkspaceFile, type WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { abortUploadSession, assertUploadSessionAuthBinding, diff --git a/apps/sim/lib/uploads/upload-session/provider.ts b/apps/sim/lib/uploads/upload-session/provider.ts index 1ef19b6f979..84cdad89315 100644 --- a/apps/sim/lib/uploads/upload-session/provider.ts +++ b/apps/sim/lib/uploads/upload-session/provider.ts @@ -35,7 +35,7 @@ import { } from '@/lib/uploads/core/storage-service' import type { StorageContext } from '@/lib/uploads/shared/types' import type { UploadStorageProvider } from '@/lib/uploads/upload-session/types' -import { sanitizeFileKey } from '@/lib/uploads/utils/file-utils' +import { sanitizeFileKey } from '@/lib/uploads/utils/file' export type { UploadStorageProvider } from '@/lib/uploads/upload-session/types' diff --git a/apps/sim/lib/uploads/upload-session/service.test.ts b/apps/sim/lib/uploads/upload-session/service.test.ts index 983c2bd67b5..1420925a282 100644 --- a/apps/sim/lib/uploads/upload-session/service.test.ts +++ b/apps/sim/lib/uploads/upload-session/service.test.ts @@ -42,7 +42,7 @@ vi.mock('@/lib/billing/storage', () => billingStorageMock) /** * Stands in for the workspace-files barrel, which pulls the whole file manager. * The real `generateWorkspaceFileKey` and its name budget are measured in - * `contexts/workspace/workspace-file-manager.test.ts`, so the purposes that key + * `contexts/workspace/file-manager.test.ts`, so the purposes that key * through it are deliberately absent from the sidecar-bounds sweep below. */ vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) diff --git a/apps/sim/lib/uploads/upload-session/service.ts b/apps/sim/lib/uploads/upload-session/service.ts index 02b4ae48143..8128a9b1586 100644 --- a/apps/sim/lib/uploads/upload-session/service.ts +++ b/apps/sim/lib/uploads/upload-session/service.ts @@ -18,11 +18,11 @@ import { } from '@/lib/billing/storage' import { OrchestrationError } from '@/lib/core/orchestration/types' import { generateUniqueExecutionFileKey } from '@/lib/uploads/contexts/execution/utils' -import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager' +import { generateKnowledgeBaseFileKey } from '@/lib/uploads/contexts/knowledge-base/file-manager' import { assertOrganizationAttachmentControlBinding } from '@/lib/uploads/contexts/organization-assistant/binding' import { assertOrganizationLogoControlBinding } from '@/lib/uploads/contexts/organization-logo/binding' import { generateWorkspaceFileKey } from '@/lib/uploads/contexts/workspace' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { buildStorageKeySegment } from '@/lib/uploads/core/storage-key' import { ASSISTANT_IMAGE_MAX_BYTES, @@ -59,7 +59,7 @@ import { WORKSPACE_FILE_UPLOAD_PROVENANCE_KEY, type WorkspaceFileUploadSource, } from '@/lib/uploads/upload-session/workspace-file-provenance' -import { isImageFileType } from '@/lib/uploads/utils/file-utils' +import { isImageFileType } from '@/lib/uploads/utils/file' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' export const UPLOAD_SESSION_PUT_MAX_BYTES = 50 * 1024 * 1024 diff --git a/apps/sim/lib/uploads/upload-session/workspace-file-provenance.ts b/apps/sim/lib/uploads/upload-session/workspace-file-provenance.ts index f47532585a9..b27ef282917 100644 --- a/apps/sim/lib/uploads/upload-session/workspace-file-provenance.ts +++ b/apps/sim/lib/uploads/upload-session/workspace-file-provenance.ts @@ -1,6 +1,6 @@ import type { WorkspaceFileSecretProvenanceEntry } from '@sim/db/schema' import { normalizeDurableSecretProvenanceEntries } from '@/lib/execution/durable-secret-provenance' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' export const WORKSPACE_FILE_UPLOAD_PROVENANCE_KEY = 'workspaceFileSecretProvenance' diff --git a/apps/sim/lib/uploads/utils/context-prefix.test.ts b/apps/sim/lib/uploads/utils/context-prefix.test.ts index 9cc82f088be..d0aa54f26ce 100644 --- a/apps/sim/lib/uploads/utils/context-prefix.test.ts +++ b/apps/sim/lib/uploads/utils/context-prefix.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { inferContextFromKey, tryInferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey, tryInferContextFromKey } from '@/lib/uploads/utils/file' describe('tryInferContextFromKey', () => { it('classifies a known prefix the same way the throwing form does', () => { diff --git a/apps/sim/lib/uploads/utils/fetch-external-url.server.ts b/apps/sim/lib/uploads/utils/fetch-external-url.server.ts index dfe830435c1..46272bee393 100644 --- a/apps/sim/lib/uploads/utils/fetch-external-url.server.ts +++ b/apps/sim/lib/uploads/utils/fetch-external-url.server.ts @@ -9,7 +9,7 @@ import { readResponseTextWithLimit, readResponseToBufferWithLimit, } from '@/lib/core/utils/stream-limits' -import { ensureFileNameExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { ensureFileNameExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' const DEFAULT_TIMEOUT_MS = 30_000 const DEFAULT_MAX_DOWNLOAD_BYTES = 100 * 1024 * 1024 diff --git a/apps/sim/lib/uploads/utils/file-schemas.ts b/apps/sim/lib/uploads/utils/file-schemas.ts index 53fb4be7b61..dbab0864190 100644 --- a/apps/sim/lib/uploads/utils/file-schemas.ts +++ b/apps/sim/lib/uploads/utils/file-schemas.ts @@ -1,5 +1,5 @@ import { z } from 'zod' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' const isUrlLike = (value: string) => value.startsWith('http://') || value.startsWith('https://') || value.startsWith('/') diff --git a/apps/sim/lib/uploads/utils/file-utils.server.test.ts b/apps/sim/lib/uploads/utils/file.server.test.ts similarity index 97% rename from apps/sim/lib/uploads/utils/file-utils.server.test.ts rename to apps/sim/lib/uploads/utils/file.server.test.ts index 920dbb2b757..6a7d21de758 100644 --- a/apps/sim/lib/uploads/utils/file-utils.server.test.ts +++ b/apps/sim/lib/uploads/utils/file.server.test.ts @@ -14,11 +14,11 @@ const { mockResolveServableDocBytes, mockRenderPage } = vi.hoisted(() => ({ vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) -vi.mock('@/lib/uploads/contexts/execution/execution-file-manager', () => ({ +vi.mock('@/lib/uploads/contexts/execution/file-manager', () => ({ downloadExecutionFile: storageServiceMockFns.mockDownloadFile, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/documents/compile', () => ({ resolveServableDocBytes: mockResolveServableDocBytes, @@ -37,7 +37,7 @@ import { downloadFileFromStorage, downloadServableFileFromStorage, downloadServableFilesWithinBudget, -} from '@/lib/uploads/utils/file-utils.server' +} from '@/lib/uploads/utils/file.server' import type { UserFile } from '@/executor/types' const mockParseWorkspaceFileKey = workspaceFileManagerMockFns.mockParseWorkspaceFileKey diff --git a/apps/sim/lib/uploads/utils/file-utils.server.ts b/apps/sim/lib/uploads/utils/file.server.ts similarity index 98% rename from apps/sim/lib/uploads/utils/file-utils.server.ts rename to apps/sim/lib/uploads/utils/file.server.ts index f266129659a..96dd5c47782 100644 --- a/apps/sim/lib/uploads/utils/file-utils.server.ts +++ b/apps/sim/lib/uploads/utils/file.server.ts @@ -15,14 +15,14 @@ import { } from '@/lib/core/utils/stream-limits' import { StorageService } from '@/lib/uploads' import { isExecutionFile } from '@/lib/uploads/contexts/execution/utils' -// This file is lazily imported back by workspace-file-manager, so that edge +// This file is lazily imported back by `contexts/workspace/file-manager`, so that edge // stays dynamic on their side; these statics do not close a load-time cycle. -import { parseWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { parseWorkspaceFileKey } from '@/lib/uploads/contexts/workspace/file-manager' import { isModelSafeWorkspaceFileKey, MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { extractStorageKey, extractWorkspaceIdFromExecutionKey, @@ -34,7 +34,7 @@ import { processSingleFileToUserFile, type RawFileInput, resolveTrustedFileContext, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { isSimPageSource, SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile' import { renderSimPageDocumentWithContributors } from '@/lib/workspace-files/page-document.server' import { type KnowledgeFileAccess, verifyFileAccess } from '@/app/api/files/authorization' @@ -382,9 +382,7 @@ export async function downloadFileFromStorage( if (isExecutionFile(userFile)) { logger.info(`[${requestId}] Downloading from execution storage: ${userFile.key}`) - const { downloadExecutionFile } = await import( - '@/lib/uploads/contexts/execution/execution-file-manager' - ) + const { downloadExecutionFile } = await import('@/lib/uploads/contexts/execution/file-manager') buffer = await downloadExecutionFile(userFile, { maxBytes, signal }) } else if (userFile.key) { const context = resolveTrustedFileContext(userFile.key, userFile.context) diff --git a/apps/sim/lib/uploads/utils/file-utils.test.ts b/apps/sim/lib/uploads/utils/file.test.ts similarity index 99% rename from apps/sim/lib/uploads/utils/file-utils.test.ts rename to apps/sim/lib/uploads/utils/file.test.ts index ffcf4bb9cf2..aca271c52cf 100644 --- a/apps/sim/lib/uploads/utils/file-utils.test.ts +++ b/apps/sim/lib/uploads/utils/file.test.ts @@ -9,7 +9,7 @@ import { resolveEffectiveMimeType, resolveFileType, resolveTrustedFileContext, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' const logger = createLogger('FileUtilsTest') diff --git a/apps/sim/lib/uploads/utils/file-utils.ts b/apps/sim/lib/uploads/utils/file.ts similarity index 100% rename from apps/sim/lib/uploads/utils/file-utils.ts rename to apps/sim/lib/uploads/utils/file.ts diff --git a/apps/sim/lib/uploads/utils/user-file-base64.server.test.ts b/apps/sim/lib/uploads/utils/user-file-base64.server.test.ts index a6fbdf94c6a..516836c8bcf 100644 --- a/apps/sim/lib/uploads/utils/user-file-base64.server.test.ts +++ b/apps/sim/lib/uploads/utils/user-file-base64.server.test.ts @@ -54,11 +54,11 @@ afterAll(resetRedisConfigMock) vi.mock('@/lib/uploads', () => uploadsMock) -vi.mock('@/lib/uploads/contexts/execution/execution-file-manager', () => ({ +vi.mock('@/lib/uploads/contexts/execution/file-manager', () => ({ downloadExecutionFile: storageServiceMockFns.mockDownloadFile, })) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/lib/uploads/utils/user-file-base64.server.ts b/apps/sim/lib/uploads/utils/user-file-base64.server.ts index a1398e3a176..24a1509a4ec 100644 --- a/apps/sim/lib/uploads/utils/user-file-base64.server.ts +++ b/apps/sim/lib/uploads/utils/user-file-base64.server.ts @@ -21,8 +21,8 @@ import { } from '@/lib/execution/payloads/materialization.server' import { materializeLargeValueRef } from '@/lib/execution/payloads/store' import { ExecutionResourceLimitError } from '@/lib/execution/resource-errors' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { isGeneratedDocumentSourceType } from '@/lib/uploads/utils/file-utils' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { isGeneratedDocumentSourceType } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' const INLINE_BASE64_JSON_OVERHEAD_BYTES = 512 * 1024 diff --git a/apps/sim/lib/uploads/zip-entry-path.ts b/apps/sim/lib/uploads/zip-entry-path.ts index 63c30b18c72..9144a9a0d8b 100644 --- a/apps/sim/lib/uploads/zip-entry-path.ts +++ b/apps/sim/lib/uploads/zip-entry-path.ts @@ -1,4 +1,4 @@ -import { ensureFileNameExtension } from '@/lib/uploads/utils/file-utils' +import { ensureFileNameExtension } from '@/lib/uploads/utils/file' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' /** Characters that are illegal in file names on common desktop platforms. */ diff --git a/apps/sim/lib/users/application/preferences-authorization.test.ts b/apps/sim/lib/users/application/preferences-authorization.test.ts index 27d59453cb1..142c4add4f4 100644 --- a/apps/sim/lib/users/application/preferences-authorization.test.ts +++ b/apps/sim/lib/users/application/preferences-authorization.test.ts @@ -20,7 +20,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/application/organization-authorization', () => organizationAuthorizationMock) vi.mock('@/lib/core/application/workspace-authorization', () => workspaceAuthorizationMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { userAccountOperations } from '@/lib/users/application/operations' import { authorizeAccountPreferences } from '@/lib/users/application/preferences-authorization' diff --git a/apps/sim/lib/users/application/preferences-authorization.ts b/apps/sim/lib/users/application/preferences-authorization.ts index c457bb1f5a4..ef1b2750560 100644 --- a/apps/sim/lib/users/application/preferences-authorization.ts +++ b/apps/sim/lib/users/application/preferences-authorization.ts @@ -4,7 +4,7 @@ import { authorizeOrganizationOperation } from '@/lib/core/application/organizat import { requireCurrentHumanRole } from '@/lib/core/application/workspace-authorization' import { OrchestrationError } from '@/lib/core/orchestration/types' import type { UserAccountOperation } from '@/lib/users/application/operations' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** Authorizes the account subject and rechecks the conversation's current membership grant. */ export async function authorizeAccountPreferences( diff --git a/apps/sim/lib/webhooks/env-resolver.test.ts b/apps/sim/lib/webhooks/env-resolver.test.ts index 175f2560553..f04126018c0 100644 --- a/apps/sim/lib/webhooks/env-resolver.test.ts +++ b/apps/sim/lib/webhooks/env-resolver.test.ts @@ -7,7 +7,7 @@ import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' const { mockGetEffectiveDecryptedEnv, mockGetExecutionEnvironment } = environmentUtilsMockFns -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) afterAll(resetEnvironmentUtilsMock) diff --git a/apps/sim/lib/webhooks/env-resolver.ts b/apps/sim/lib/webhooks/env-resolver.ts index 3220d71d1ec..ca3ef9f0050 100644 --- a/apps/sim/lib/webhooks/env-resolver.ts +++ b/apps/sim/lib/webhooks/env-resolver.ts @@ -1,5 +1,5 @@ import { isRecordLike } from '@sim/utils/object' -import { getWorkspaceBilledAccountUserId } from '@/lib/billing/core/billing-attribution' +import { getWorkspaceBilledAccountUserId } from '@/lib/billing/core/attribution' import { getEffectiveDecryptedEnv, getExecutionEnvironment } from '@/lib/environment/utils' import { resolveEnvVarReferences } from '@/executor/utils/reference-validation' diff --git a/apps/sim/lib/webhooks/processor.ts b/apps/sim/lib/webhooks/processor.ts index d4016ca9c88..55434ddfcf0 100644 --- a/apps/sim/lib/webhooks/processor.ts +++ b/apps/sim/lib/webhooks/processor.ts @@ -8,7 +8,7 @@ import { truncate } from '@sim/utils/string' import { and, eq, isNull, or, sql } from 'drizzle-orm' import { type NextRequest, NextResponse } from 'next/server' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { tryAdmit } from '@/lib/core/admission/gate' import { getDeterministicAdmissionRejectionCode } from '@/lib/core/admission/rejection' import { diff --git a/apps/sim/lib/webhooks/provider-subscriptions.test.ts b/apps/sim/lib/webhooks/provider-subscriptions.test.ts index 9e9c48ec0a4..decb331a631 100644 --- a/apps/sim/lib/webhooks/provider-subscriptions.test.ts +++ b/apps/sim/lib/webhooks/provider-subscriptions.test.ts @@ -18,7 +18,7 @@ vi.mock('@/lib/webhooks/providers', () => ({ getProviderHandler: mockGetProviderHandler, })) -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { cleanupExternalWebhook, diff --git a/apps/sim/lib/webhooks/providers/telegram.test.ts b/apps/sim/lib/webhooks/providers/telegram.test.ts index fb54cfd31bd..94eb3f151fe 100644 --- a/apps/sim/lib/webhooks/providers/telegram.test.ts +++ b/apps/sim/lib/webhooks/providers/telegram.test.ts @@ -9,7 +9,7 @@ import { environmentUtilsMockFns } from '@sim/testing/mocks/environment-utils.mo import { createMockRequest } from '@sim/testing/mocks/request.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) +vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) import { telegramHandler } from '@/lib/webhooks/providers/telegram' import type { AuthContext, SubscriptionContext } from '@/lib/webhooks/providers/types' diff --git a/apps/sim/lib/webhooks/slack-execution-stream.ts b/apps/sim/lib/webhooks/slack-execution-stream.ts index e595aa0e90e..d69be842105 100644 --- a/apps/sim/lib/webhooks/slack-execution-stream.ts +++ b/apps/sim/lib/webhooks/slack-execution-stream.ts @@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger' import { getValueAtPath, isRecordLike } from '@sim/utils/object' import { truncate } from '@sim/utils/string' import type { LoggingSession } from '@/lib/logs/execution/logging-session' -import { getToolDisplayTitle } from '@/lib/mothership/tools/tool-display' +import { getToolDisplayTitle } from '@/lib/mothership/tools/display' import { getSlackBotCredential } from '@/lib/oauth/credential-service' import { appendSlackAgentStream, diff --git a/apps/sim/lib/workflow-tests/application/availability.ts b/apps/sim/lib/workflow-tests/application/availability.ts index 87e2145de0d..1e1ad705c4f 100644 --- a/apps/sim/lib/workflow-tests/application/availability.ts +++ b/apps/sim/lib/workflow-tests/application/availability.ts @@ -1,6 +1,6 @@ import { defineAuthorizedWorkspaceUseCase, defineWorkspaceOperation } from '@/lib/core/application' import { isWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' /** permission-group-exempt: reports rollout availability only; test operations enforce files.use. */ const availabilityOperation = defineWorkspaceOperation({ diff --git a/apps/sim/lib/workflow-tests/application/run-tests.ts b/apps/sim/lib/workflow-tests/application/run-tests.ts index 0b80e02b3c4..24d1d4bdbd2 100644 --- a/apps/sim/lib/workflow-tests/application/run-tests.ts +++ b/apps/sim/lib/workflow-tests/application/run-tests.ts @@ -11,7 +11,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { fetchWorkspaceFileBuffer, getWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { workflowTestOperations } from '@/lib/workflow-tests/application/operations' import { testSourceHash } from '@/lib/workflow-tests/definition' import { requireWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag' @@ -29,7 +29,7 @@ import { import { runWorkflowTestFile } from '@/lib/workflow-tests/run-test-file' import { MAX_TEST_SOURCE_BYTES } from '@/lib/workflow-tests/source-write' import type { WorkflowTestVersion } from '@/lib/workflows/application/run-workflow-for-test' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('WorkflowTestRuns') diff --git a/apps/sim/lib/workflow-tests/application/tests.ts b/apps/sim/lib/workflow-tests/application/tests.ts index 038ecabb4a2..f792c1a95f2 100644 --- a/apps/sim/lib/workflow-tests/application/tests.ts +++ b/apps/sim/lib/workflow-tests/application/tests.ts @@ -3,7 +3,7 @@ import { getPostgresErrorCode } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { createOwnedWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { createOwnedWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { workflowTestOperations } from '@/lib/workflow-tests/application/operations' import { starterTestSource, testSourceHash } from '@/lib/workflow-tests/definition' import { requireWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag' @@ -28,7 +28,7 @@ import { type WorkflowTestRunRow, } from '@/lib/workflow-tests/repository' import type { WorkflowTestVersion } from '@/lib/workflows/application/run-workflow-for-test' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const authorizationOptions = { delegation: { audience: 'sim:workspaces', isWithinScope: () => true }, diff --git a/apps/sim/lib/workflow-tests/judge.ts b/apps/sim/lib/workflow-tests/judge.ts index a36426760f9..8cb214423b1 100644 --- a/apps/sim/lib/workflow-tests/judge.ts +++ b/apps/sim/lib/workflow-tests/judge.ts @@ -5,7 +5,7 @@ import { checkAttributedUsageLimits, resolveBillingAttribution, toBillingContext, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { recordUsage } from '@/lib/billing/core/usage-log' import { checkAndBillPayerOverageThreshold } from '@/lib/billing/threshold-billing' import { validateModelProvider } from '@/ee/access-control/utils/permission-check' diff --git a/apps/sim/lib/workflow-tests/session.ts b/apps/sim/lib/workflow-tests/session.ts index 8654dd114d0..65340e4b364 100644 --- a/apps/sim/lib/workflow-tests/session.ts +++ b/apps/sim/lib/workflow-tests/session.ts @@ -21,7 +21,7 @@ import { type WorkflowTestRunResult, type WorkflowTestVersion, } from '@/lib/workflows/application/run-workflow-for-test' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' import { loadDeployedWorkflowState, loadWorkflowFromNormalizedTables, diff --git a/apps/sim/lib/workflows/api/route-policies.ts b/apps/sim/lib/workflows/api/route-policies.ts index b777a8a1a27..72bb9fc48eb 100644 --- a/apps/sim/lib/workflows/api/route-policies.ts +++ b/apps/sim/lib/workflows/api/route-policies.ts @@ -22,8 +22,8 @@ import { authenticateApiKeyFromHeader, updateApiKeyLastUsed } from '@/lib/api-ke import { asOrchestrationError, statusForOrchestrationError } from '@/lib/core/orchestration/types' import { WorkflowRunAlreadyTerminalError } from '@/lib/execution/workflow-run-already-terminal-error' import { WORKFLOW_DELEGATION_AUDIENCE } from '@/lib/workflows/application/authorization' -import { WorkflowImportError } from '@/lib/workflows/application/workflow-import-error' -import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/workflow-operations-error' +import { WorkflowImportError } from '@/lib/workflows/application/import-error' +import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/operations-error' import { WorkspaceOperationConflict } from '@/lib/workspaces/operations/receipts' import { v2CaughtOrchestrationError, diff --git a/apps/sim/lib/workflows/application/admit-run-files.test.ts b/apps/sim/lib/workflows/application/admit-run-files.test.ts index 4c6eec1e5e2..631a439a260 100644 --- a/apps/sim/lib/workflows/application/admit-run-files.test.ts +++ b/apps/sim/lib/workflows/application/admit-run-files.test.ts @@ -12,7 +12,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) const provenance = { diff --git a/apps/sim/lib/workflows/application/admit-run-files.ts b/apps/sim/lib/workflows/application/admit-run-files.ts index 717cd3ef7cd..ed4040729bd 100644 --- a/apps/sim/lib/workflows/application/admit-run-files.ts +++ b/apps/sim/lib/workflows/application/admit-run-files.ts @@ -7,7 +7,7 @@ import { isCopilotPrincipal, } from '@/lib/core/application' import { isUserFileWithMetadata } from '@/lib/core/utils/user-file' -import { getStoredFileSecretProvenanceByKey } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { getStoredFileSecretProvenanceByKey } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import type { UserFile } from '@/executor/types' /** Admits each run file on its own; see {@link admitRunFiles}. Returns the admitted files. */ diff --git a/apps/sim/lib/workflows/application/apply-workflow-operations.test.ts b/apps/sim/lib/workflows/application/apply-workflow-operations.test.ts index 0584915c66b..490cf941a9a 100644 --- a/apps/sim/lib/workflows/application/apply-workflow-operations.test.ts +++ b/apps/sim/lib/workflows/application/apply-workflow-operations.test.ts @@ -112,7 +112,7 @@ import { applyWorkflowOperations, DRY_RUN_PREVIEW_BLOCK_IDS_WARNING, } from '@/lib/workflows/application/apply-workflow-operations' -import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/workflow-operations-error' +import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/operations-error' const mocks = { ...hoisted, diff --git a/apps/sim/lib/workflows/application/apply-workflow-operations.ts b/apps/sim/lib/workflows/application/apply-workflow-operations.ts index 83210d9a0bf..a44e8b3f9d2 100644 --- a/apps/sim/lib/workflows/application/apply-workflow-operations.ts +++ b/apps/sim/lib/workflows/application/apply-workflow-operations.ts @@ -16,12 +16,12 @@ import { MAX_PLAN_REQUIRED } from '@/lib/execution/remote-sandbox/entitlement' import { resolvePermissionGroupConfig } from '@/lib/permission-groups/config-scope.server' import { notifyWorkflowUpdated } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { withWorkflowBlockScope } from '@/lib/workflows/application/block-scope' import type { ActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' +import { requireMutableWorkflow } from '@/lib/workflows/application/mutability' import { workflowOperations } from '@/lib/workflows/application/operations' +import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/operations-error' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { withWorkflowBlockScope } from '@/lib/workflows/application/workflow-block-scope' -import { requireMutableWorkflow } from '@/lib/workflows/application/workflow-mutability' -import { WorkflowOperationsNotAppliedError } from '@/lib/workflows/application/workflow-operations-error' import { applyTargetedLayout, getTargetedLayoutImpact, diff --git a/apps/sim/lib/workflows/application/workflow-block-scope.ts b/apps/sim/lib/workflows/application/block-scope.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-block-scope.ts rename to apps/sim/lib/workflows/application/block-scope.ts diff --git a/apps/sim/lib/workflows/application/context.test.ts b/apps/sim/lib/workflows/application/context.test.ts index 43b1480b03f..9adf8b4ab9b 100644 --- a/apps/sim/lib/workflows/application/context.test.ts +++ b/apps/sim/lib/workflows/application/context.test.ts @@ -13,7 +13,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@/lib/core/async-jobs', () => asyncJobsMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) import { resolveActiveWorkflowApplicationContext, diff --git a/apps/sim/lib/workflows/application/context.ts b/apps/sim/lib/workflows/application/context.ts index ade9755b86b..8eff7e6b265 100644 --- a/apps/sim/lib/workflows/application/context.ts +++ b/apps/sim/lib/workflows/application/context.ts @@ -10,7 +10,7 @@ import { and, eq, inArray, isNull } from 'drizzle-orm' import { getJobQueue } from '@/lib/core/async-jobs' import { OrchestrationError } from '@/lib/core/orchestration/types' import { WORKFLOW_EXECUTION_JOB_ID_PREFIX } from '@/lib/workflows/executor/execution-job-ids' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export interface ActiveWorkflowApplicationContext { workflowId: string diff --git a/apps/sim/lib/workflows/application/create-workflow.ts b/apps/sim/lib/workflows/application/create-workflow.ts index 295edac51c3..1ed4cf188a0 100644 --- a/apps/sim/lib/workflows/application/create-workflow.ts +++ b/apps/sim/lib/workflows/application/create-workflow.ts @@ -8,15 +8,15 @@ import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { notifyWorkflowUpdated, notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' -import { workflowOperations } from '@/lib/workflows/application/operations' -import { requireWorkflowTransition } from '@/lib/workflows/application/transition-result' import { resolveWorkflowFolderPath, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' +import { workflowOperations } from '@/lib/workflows/application/operations' +import { requireWorkflowTransition } from '@/lib/workflows/application/transition-result' import { performCreateWorkflowTransition } from '@/lib/workflows/orchestration' import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('CreateWorkflow') diff --git a/apps/sim/lib/workflows/application/workflow-crud.test.ts b/apps/sim/lib/workflows/application/crud.test.ts similarity index 98% rename from apps/sim/lib/workflows/application/workflow-crud.test.ts rename to apps/sim/lib/workflows/application/crud.test.ts index 9fe47625166..9c1a9955fbe 100644 --- a/apps/sim/lib/workflows/application/workflow-crud.test.ts +++ b/apps/sim/lib/workflows/application/crud.test.ts @@ -38,11 +38,11 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) -vi.mock('@/lib/workflows/application/workflow-folders', () => ({ +vi.mock('@/lib/workflows/application/folders', () => ({ resolveWorkflowFolderPath: hoisted.resolveFolderPath, workflowFolderPathForId: hoisted.folderPathForId, })) diff --git a/apps/sim/lib/workflows/application/workflow-custom-block-authoring.test.ts b/apps/sim/lib/workflows/application/custom-block-authoring.test.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-custom-block-authoring.test.ts rename to apps/sim/lib/workflows/application/custom-block-authoring.test.ts diff --git a/apps/sim/lib/workflows/application/workflow-deployments.test.ts b/apps/sim/lib/workflows/application/deployments.test.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-deployments.test.ts rename to apps/sim/lib/workflows/application/deployments.test.ts diff --git a/apps/sim/lib/workflows/application/deployments.ts b/apps/sim/lib/workflows/application/deployments.ts index 82b4ba50f5a..219813bcdea 100644 --- a/apps/sim/lib/workflows/application/deployments.ts +++ b/apps/sim/lib/workflows/application/deployments.ts @@ -14,10 +14,10 @@ import { notifyWorkflowReverted } from '@/lib/realtime/notify' import { listDeployedWebhookUrls } from '@/lib/webhooks/deployed-urls' import { requireWorkflowExecutionUserId } from '@/lib/workflows/application/authorization' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { withWorkflowBlockScope } from '@/lib/workflows/application/block-scope' import type { ActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' import { workflowOperations } from '@/lib/workflows/application/operations' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { withWorkflowBlockScope } from '@/lib/workflows/application/workflow-block-scope' import { checkNeedsRedeployment } from '@/lib/workflows/deployment-status' import type { WorkflowLintReport } from '@/lib/workflows/editing/lint' import { buildWorkflowLintReport } from '@/lib/workflows/editing/lint-report' diff --git a/apps/sim/lib/workflows/application/download-workflow-run-file.test.ts b/apps/sim/lib/workflows/application/download-workflow-run-file.test.ts index 55c5485aea3..33d52c2ed94 100644 --- a/apps/sim/lib/workflows/application/download-workflow-run-file.test.ts +++ b/apps/sim/lib/workflows/application/download-workflow-run-file.test.ts @@ -20,7 +20,7 @@ const mocks = vi.hoisted(() => ({ getRunFiles: vi.fn(), })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workflows/application/download-workflow-run-file.ts b/apps/sim/lib/workflows/application/download-workflow-run-file.ts index de65b6721fd..03248138683 100644 --- a/apps/sim/lib/workflows/application/download-workflow-run-file.ts +++ b/apps/sim/lib/workflows/application/download-workflow-run-file.ts @@ -4,7 +4,7 @@ import { ContentRefusedError } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { nodeReadableToWebStream } from '@/lib/core/utils/node-stream' import { downloadFileStream } from '@/lib/uploads/core/storage-service' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import { admitRunFiles } from '@/lib/workflows/application/admit-run-files' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { diff --git a/apps/sim/lib/workflows/application/duplicate-workflow.ts b/apps/sim/lib/workflows/application/duplicate-workflow.ts index 024b5fb6066..05ecb0ea4e4 100644 --- a/apps/sim/lib/workflows/application/duplicate-workflow.ts +++ b/apps/sim/lib/workflows/application/duplicate-workflow.ts @@ -10,12 +10,12 @@ import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { notifyWorkflowUpdated, notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { resolveActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' -import { workflowOperations } from '@/lib/workflows/application/operations' -import { assertedWorkflowWorkspaceId } from '@/lib/workflows/application/principal-scope' import { resolveWorkflowFolderPath, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' +import { workflowOperations } from '@/lib/workflows/application/operations' +import { assertedWorkflowWorkspaceId } from '@/lib/workflows/application/principal-scope' import { duplicateWorkflow as duplicateWorkflowRecord } from '@/lib/workflows/persistence/duplicate' export interface DuplicateWorkflowInput { diff --git a/apps/sim/lib/workflows/application/workflow-folders.test.ts b/apps/sim/lib/workflows/application/folders.test.ts similarity index 97% rename from apps/sim/lib/workflows/application/workflow-folders.test.ts rename to apps/sim/lib/workflows/application/folders.test.ts index d1ffdedeccc..4d8a9d78346 100644 --- a/apps/sim/lib/workflows/application/workflow-folders.test.ts +++ b/apps/sim/lib/workflows/application/folders.test.ts @@ -18,7 +18,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/folders/orchestration', () => foldersOrchestrationMock) @@ -30,7 +30,7 @@ import { deleteWorkflowFolder, listWorkflowFolders, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' const mocks = { loadIndex: folderQueriesMockFns.mockLoadActiveFolderPathIndex, diff --git a/apps/sim/lib/workflows/application/workflow-folders.ts b/apps/sim/lib/workflows/application/folders.ts similarity index 99% rename from apps/sim/lib/workflows/application/workflow-folders.ts rename to apps/sim/lib/workflows/application/folders.ts index eecf33336a7..437e6574ca8 100644 --- a/apps/sim/lib/workflows/application/workflow-folders.ts +++ b/apps/sim/lib/workflows/application/folders.ts @@ -20,7 +20,7 @@ import { } from '@/lib/folders/queries' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { workflowOperations } from '@/lib/workflows/application/operations' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' type WorkflowFolderRecord = typeof folder.$inferSelect type WorkflowFolderIndex = FolderPathIndex diff --git a/apps/sim/lib/workflows/application/workflow-import-error.ts b/apps/sim/lib/workflows/application/import-error.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-import-error.ts rename to apps/sim/lib/workflows/application/import-error.ts diff --git a/apps/sim/lib/workflows/application/import-export.test.ts b/apps/sim/lib/workflows/application/import-export.test.ts index 6a5027eccca..cf0d7955de3 100644 --- a/apps/sim/lib/workflows/application/import-export.test.ts +++ b/apps/sim/lib/workflows/application/import-export.test.ts @@ -20,7 +20,7 @@ const hoisted = vi.hoisted(() => ({ folderLock: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@sim/audit', () => auditMock) @@ -41,8 +41,8 @@ vi.mock('@/lib/workflows/operations/export-workflow', () => ({ buildWorkflowExportPayload: hoisted.buildExport, })) +import { WorkflowImportError } from '@/lib/workflows/application/import-error' import { exportWorkflow, importWorkflow } from '@/lib/workflows/application/import-export' -import { WorkflowImportError } from '@/lib/workflows/application/workflow-import-error' const mocks = { ...hoisted, diff --git a/apps/sim/lib/workflows/application/import-export.ts b/apps/sim/lib/workflows/application/import-export.ts index 5c3e719230f..7d8460807cc 100644 --- a/apps/sim/lib/workflows/application/import-export.ts +++ b/apps/sim/lib/workflows/application/import-export.ts @@ -9,13 +9,13 @@ import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { resolveActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' -import { applyMappedWorkflowImport } from '@/lib/workflows/application/mapped-import' -import { workflowOperations } from '@/lib/workflows/application/operations' import { resolveWorkflowFolderPath, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' -import { WorkflowImportError } from '@/lib/workflows/application/workflow-import-error' +} from '@/lib/workflows/application/folders' +import { WorkflowImportError } from '@/lib/workflows/application/import-error' +import { applyMappedWorkflowImport } from '@/lib/workflows/application/mapped-import' +import { workflowOperations } from '@/lib/workflows/application/operations' import { buildWorkflowExportPayload, type WorkflowExportPayload, @@ -25,7 +25,7 @@ import { importWorkflowIntoWorkspaceTransition, } from '@/lib/workflows/operations/import-workflow' import type { MappedImportOptions } from '@/lib/workflows/references/import-plan' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import type { WorkspaceOperationReport } from '@/lib/workspaces/operations/receipts' export interface ImportWorkflowInput extends MappedImportOptions { diff --git a/apps/sim/lib/workflows/application/list-workflow-runs.test.ts b/apps/sim/lib/workflows/application/list-workflow-runs.test.ts index 4b13a0d9a6d..1b0dfad61a0 100644 --- a/apps/sim/lib/workflows/application/list-workflow-runs.test.ts +++ b/apps/sim/lib/workflows/application/list-workflow-runs.test.ts @@ -33,7 +33,7 @@ const mocks = vi.hoisted(() => ({ vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/workflows/application/list-workflows.ts b/apps/sim/lib/workflows/application/list-workflows.ts index 951d42b3b6e..c0750912543 100644 --- a/apps/sim/lib/workflows/application/list-workflows.ts +++ b/apps/sim/lib/workflows/application/list-workflows.ts @@ -3,17 +3,17 @@ import type { CursorKey } from '@/lib/api/list-query' import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { loadActiveFolderPathIndex, resolveFolderPathFilter } from '@/lib/folders/queries' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' -import { workflowOperations } from '@/lib/workflows/application/operations' import { archivableWorkflowFolderPath, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' +import { workflowOperations } from '@/lib/workflows/application/operations' import { listWorkspaceWorkflows, type WorkflowSortBy, type WorkflowSortOrder, } from '@/lib/workflows/queries' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const logger = createLogger('ListWorkflows') diff --git a/apps/sim/lib/workflows/application/mapped-import.ts b/apps/sim/lib/workflows/application/mapped-import.ts index 7832fcd72f3..51435fceb6f 100644 --- a/apps/sim/lib/workflows/application/mapped-import.ts +++ b/apps/sim/lib/workflows/application/mapped-import.ts @@ -11,16 +11,16 @@ import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { acquireFolderMutationLock } from '@/lib/folders/locks' import { loadActiveFolderPathIndex, resolveFolderPathFromIndex } from '@/lib/folders/queries' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { + resolveWorkflowFolderPath, + workflowFolderPathForId, +} from '@/lib/workflows/application/folders' +import { WorkflowImportError } from '@/lib/workflows/application/import-error' import type { ImportWorkflowInput, ImportWorkflowOutcome, } from '@/lib/workflows/application/import-export' import { workflowOperations } from '@/lib/workflows/application/operations' -import { - resolveWorkflowFolderPath, - workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' -import { WorkflowImportError } from '@/lib/workflows/application/workflow-import-error' import { resolveImportedMetadata } from '@/lib/workflows/operations/import-workflow' import { createWorkflowInTransaction } from '@/lib/workflows/orchestration/workflow-lifecycle' import { prepareWorkflowStateForPersistence } from '@/lib/workflows/persistence/prepare-state' @@ -47,7 +47,7 @@ import { assertWorkflowPreviewFits } from '@/lib/workflows/references/preview-li import { type ActiveWorkspaceApplicationContext, resolveActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' import { WORKSPACE_WORKFLOWS_CHANGED_EVENT } from '@/lib/workspaces/operations/outbox-events' import { findWorkspaceOperationReceipt, diff --git a/apps/sim/lib/workflows/application/move-workflows-bulk.test.ts b/apps/sim/lib/workflows/application/move-workflows-bulk.test.ts index 648dcbfc639..feb12deefff 100644 --- a/apps/sim/lib/workflows/application/move-workflows-bulk.test.ts +++ b/apps/sim/lib/workflows/application/move-workflows-bulk.test.ts @@ -17,7 +17,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/orchestration', () => workflowsOrchestrationMock) diff --git a/apps/sim/lib/workflows/application/move-workflows-bulk.ts b/apps/sim/lib/workflows/application/move-workflows-bulk.ts index ec102f57692..015c615249a 100644 --- a/apps/sim/lib/workflows/application/move-workflows-bulk.ts +++ b/apps/sim/lib/workflows/application/move-workflows-bulk.ts @@ -13,11 +13,11 @@ import { principalAuditSource } from '@/lib/core/application' import { asOrchestrationError, OrchestrationError } from '@/lib/core/orchestration/types' import { notifyWorkflowUpdated, notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { resolveWorkflowFolderPath } from '@/lib/workflows/application/folders' import { workflowOperations } from '@/lib/workflows/application/operations' import { requireWorkflowTransition } from '@/lib/workflows/application/transition-result' -import { resolveWorkflowFolderPath } from '@/lib/workflows/application/workflow-folders' import { updateWorkflowRecord } from '@/lib/workflows/orchestration' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' const MAX_BULK_WORKFLOW_MOVES = 100 diff --git a/apps/sim/lib/workflows/application/workflow-mutability.ts b/apps/sim/lib/workflows/application/mutability.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-mutability.ts rename to apps/sim/lib/workflows/application/mutability.ts diff --git a/apps/sim/lib/workflows/application/workflow-operations-error.ts b/apps/sim/lib/workflows/application/operations-error.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-operations-error.ts rename to apps/sim/lib/workflows/application/operations-error.ts diff --git a/apps/sim/lib/workflows/application/read-workflow-lint.ts b/apps/sim/lib/workflows/application/read-workflow-lint.ts index f8522da12a7..ec17565104b 100644 --- a/apps/sim/lib/workflows/application/read-workflow-lint.ts +++ b/apps/sim/lib/workflows/application/read-workflow-lint.ts @@ -20,6 +20,7 @@ import { collectSortFieldNames, } from '@/lib/table/query-builder/field-names' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { withWorkflowBlockScope } from '@/lib/workflows/application/block-scope' import { resolveActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' import { workflowOperations } from '@/lib/workflows/application/operations' import { @@ -28,7 +29,6 @@ import { type ReadWorkflowGraphResult, readWorkflowGraph, } from '@/lib/workflows/application/read-workflow-graph' -import { withWorkflowBlockScope } from '@/lib/workflows/application/workflow-block-scope' import type { WorkflowLintReport } from '@/lib/workflows/editing/lint' import { buildWorkflowLintReport, diff --git a/apps/sim/lib/workflows/application/read-workflow-version.ts b/apps/sim/lib/workflows/application/read-workflow-version.ts index 8d506dba323..03d2e813263 100644 --- a/apps/sim/lib/workflows/application/read-workflow-version.ts +++ b/apps/sim/lib/workflows/application/read-workflow-version.ts @@ -3,7 +3,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { workflowOperations } from '@/lib/workflows/application/operations' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor' +import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/extractor' import { materializeWorkflowComparisonState } from '@/lib/workflows/persistence/comparison-state' import { getWorkflowDeploymentVersion } from '@/lib/workflows/persistence/utils' import type { WorkflowState } from '@/stores/workflows/workflow/types' diff --git a/apps/sim/lib/workflows/application/read-workflow.ts b/apps/sim/lib/workflows/application/read-workflow.ts index fd710f93831..d224c13e19a 100644 --- a/apps/sim/lib/workflows/application/read-workflow.ts +++ b/apps/sim/lib/workflows/application/read-workflow.ts @@ -3,9 +3,9 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { workflowFolderPathForId } from '@/lib/workflows/application/folders' import { workflowOperations } from '@/lib/workflows/application/operations' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { workflowFolderPathForId } from '@/lib/workflows/application/workflow-folders' import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format' import { loadWorkflowReadSnapshot } from '@/lib/workflows/queries' diff --git a/apps/sim/lib/workflows/application/replace-workflow-state.ts b/apps/sim/lib/workflows/application/replace-workflow-state.ts index 322e33a0f35..e479228856c 100644 --- a/apps/sim/lib/workflows/application/replace-workflow-state.ts +++ b/apps/sim/lib/workflows/application/replace-workflow-state.ts @@ -12,10 +12,10 @@ import { principalAuditSource } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { notifyWorkflowUpdated } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { withWorkflowBlockScope } from '@/lib/workflows/application/block-scope' +import { requireMutableWorkflow } from '@/lib/workflows/application/mutability' import { workflowOperations } from '@/lib/workflows/application/operations' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { withWorkflowBlockScope } from '@/lib/workflows/application/workflow-block-scope' -import { requireMutableWorkflow } from '@/lib/workflows/application/workflow-mutability' import { normalizeWorkflowVariables } from '@/lib/workflows/application/workflow-variables' import { checkNeedsRedeployment } from '@/lib/workflows/deployment-status' import type { WorkflowLintReport } from '@/lib/workflows/editing/lint' diff --git a/apps/sim/lib/workflows/application/restore-workflow.ts b/apps/sim/lib/workflows/application/restore-workflow.ts index 3d8149aaf40..5ae2d53030c 100644 --- a/apps/sim/lib/workflows/application/restore-workflow.ts +++ b/apps/sim/lib/workflows/application/restore-workflow.ts @@ -14,9 +14,9 @@ import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { notifyWorkflowUpdated, notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import { resolveArchivedWorkflowApplicationContext } from '@/lib/workflows/application/context' +import { workflowFolderPathForId } from '@/lib/workflows/application/folders' import { workflowOperations } from '@/lib/workflows/application/operations' import { assertedWorkflowWorkspaceId } from '@/lib/workflows/application/principal-scope' -import { workflowFolderPathForId } from '@/lib/workflows/application/workflow-folders' import { restoreWorkflow as restoreWorkflowRecord } from '@/lib/workflows/lifecycle' const logger = createLogger('RestoreWorkflow') diff --git a/apps/sim/lib/workflows/application/workflow-run-control.test.ts b/apps/sim/lib/workflows/application/run-control.test.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-run-control.test.ts rename to apps/sim/lib/workflows/application/run-control.test.ts diff --git a/apps/sim/lib/workflows/application/run-workflow-for-test.ts b/apps/sim/lib/workflows/application/run-workflow-for-test.ts index e6d81c96528..448eb42bce9 100644 --- a/apps/sim/lib/workflows/application/run-workflow-for-test.ts +++ b/apps/sim/lib/workflows/application/run-workflow-for-test.ts @@ -9,7 +9,7 @@ import { releaseExecutionSlot, reserveExecutionSlot, } from '@/lib/billing/calculations/usage-reservation' -import { resolveBillingAttribution } from '@/lib/billing/core/billing-attribution' +import { resolveBillingAttribution } from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { getExecutionTimeout, RESERVATION_TTL_BUFFER_MS } from '@/lib/core/execution-limits/types' import { OrchestrationError } from '@/lib/core/orchestration/types' diff --git a/apps/sim/lib/workflows/application/run-workflow-from-copilot.ts b/apps/sim/lib/workflows/application/run-workflow-from-copilot.ts index 56bb9b37fc8..db2e8a70380 100644 --- a/apps/sim/lib/workflows/application/run-workflow-from-copilot.ts +++ b/apps/sim/lib/workflows/application/run-workflow-from-copilot.ts @@ -4,7 +4,7 @@ import { toError } from '@sim/utils/errors' import { generateId } from '@sim/utils/id' import { mergeSubblockStateWithValues } from '@sim/workflow-persistence/subblocks' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { OrchestrationError } from '@/lib/core/orchestration/types' import { generateRequestId } from '@/lib/core/utils/request' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' diff --git a/apps/sim/lib/workflows/application/workflow-runs.test.ts b/apps/sim/lib/workflows/application/runs.test.ts similarity index 100% rename from apps/sim/lib/workflows/application/workflow-runs.test.ts rename to apps/sim/lib/workflows/application/runs.test.ts diff --git a/apps/sim/lib/workflows/application/update-workflow-content.test.ts b/apps/sim/lib/workflows/application/update-workflow-content.test.ts index 95413a3ced9..cd853b4e8b0 100644 --- a/apps/sim/lib/workflows/application/update-workflow-content.test.ts +++ b/apps/sim/lib/workflows/application/update-workflow-content.test.ts @@ -19,7 +19,7 @@ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/workflows/application/context', () => workflowContextMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/workflows/application/workflow-mutability', () => ({ +vi.mock('@/lib/workflows/application/mutability', () => ({ requireMutableWorkflow: mocks.requireMutable, })) diff --git a/apps/sim/lib/workflows/application/update-workflow-content.ts b/apps/sim/lib/workflows/application/update-workflow-content.ts index 68a9278e718..6748dec9001 100644 --- a/apps/sim/lib/workflows/application/update-workflow-content.ts +++ b/apps/sim/lib/workflows/application/update-workflow-content.ts @@ -7,9 +7,9 @@ import { principalAuditSource } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' import { notifyWorkflowUpdated } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' +import { requireMutableWorkflow } from '@/lib/workflows/application/mutability' import { workflowOperations } from '@/lib/workflows/application/operations' import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { requireMutableWorkflow } from '@/lib/workflows/application/workflow-mutability' import { coerceWorkflowVariableValue, normalizeWorkflowVariables, diff --git a/apps/sim/lib/workflows/application/update-workflow.ts b/apps/sim/lib/workflows/application/update-workflow.ts index 206fdaf3cd8..581a4c38466 100644 --- a/apps/sim/lib/workflows/application/update-workflow.ts +++ b/apps/sim/lib/workflows/application/update-workflow.ts @@ -14,13 +14,13 @@ import { loadActiveFolderPathIndex } from '@/lib/folders/queries' import { notifyWorkflowUpdated, notifyWorkspaceWorkflowsChanged } from '@/lib/realtime/notify' import { defineAuthorizedWorkflowUseCase } from '@/lib/workflows/application/authorized-workflow-use-case' import type { ActiveWorkflowApplicationContext } from '@/lib/workflows/application/context' -import { workflowOperations } from '@/lib/workflows/application/operations' -import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' -import { requireWorkflowTransition } from '@/lib/workflows/application/transition-result' import { resolveWorkflowFolderPath, workflowFolderPathForId, -} from '@/lib/workflows/application/workflow-folders' +} from '@/lib/workflows/application/folders' +import { workflowOperations } from '@/lib/workflows/application/operations' +import { resolvePrincipalWorkflowContext } from '@/lib/workflows/application/principal-scope' +import { requireWorkflowTransition } from '@/lib/workflows/application/transition-result' import { updateWorkflowRecord } from '@/lib/workflows/orchestration' const logger = createLogger('UpdateWorkflow') diff --git a/apps/sim/lib/workflows/blocks/flatten-outputs.ts b/apps/sim/lib/workflows/blocks/flatten-outputs.ts index 7c3feb35739..e5eb6763f1d 100644 --- a/apps/sim/lib/workflows/blocks/flatten-outputs.ts +++ b/apps/sim/lib/workflows/blocks/flatten-outputs.ts @@ -9,7 +9,7 @@ */ import { isRecordLike } from '@sim/utils/object' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' import { HUMAN_IN_THE_LOOP_BLOCK_TYPES } from '@/executor/constants' /** diff --git a/apps/sim/lib/workflows/blocks/block-outputs.test.ts b/apps/sim/lib/workflows/blocks/outputs.test.ts similarity index 98% rename from apps/sim/lib/workflows/blocks/block-outputs.test.ts rename to apps/sim/lib/workflows/blocks/outputs.test.ts index a8ba7281112..3a712672f90 100644 --- a/apps/sim/lib/workflows/blocks/block-outputs.test.ts +++ b/apps/sim/lib/workflows/blocks/outputs.test.ts @@ -3,7 +3,7 @@ import { getEffectiveBlockOutputPaths, getEffectiveBlockOutputs, getEffectiveBlockOutputType, -} from '@/lib/workflows/blocks/block-outputs' +} from '@/lib/workflows/blocks/outputs' type SubBlocks = Record diff --git a/apps/sim/lib/workflows/blocks/block-outputs.ts b/apps/sim/lib/workflows/blocks/outputs.ts similarity index 100% rename from apps/sim/lib/workflows/blocks/block-outputs.ts rename to apps/sim/lib/workflows/blocks/outputs.ts diff --git a/apps/sim/lib/workflows/blocks/block-path-calculator.ts b/apps/sim/lib/workflows/blocks/path-calculator.ts similarity index 100% rename from apps/sim/lib/workflows/blocks/block-path-calculator.ts rename to apps/sim/lib/workflows/blocks/path-calculator.ts diff --git a/apps/sim/lib/workflows/blocks/block-reference-tags.test.ts b/apps/sim/lib/workflows/blocks/reference-tags.test.ts similarity index 95% rename from apps/sim/lib/workflows/blocks/block-reference-tags.test.ts rename to apps/sim/lib/workflows/blocks/reference-tags.test.ts index f169e4e89c0..17dd109e598 100644 --- a/apps/sim/lib/workflows/blocks/block-reference-tags.test.ts +++ b/apps/sim/lib/workflows/blocks/reference-tags.test.ts @@ -1,6 +1,6 @@ import type { Mock } from 'vitest' import { beforeEach, describe, expect, it } from 'vitest' -import { getBlockReferenceTags } from '@/lib/workflows/blocks/block-reference-tags' +import { getBlockReferenceTags } from '@/lib/workflows/blocks/reference-tags' import { getAllBlocks, getBlock } from '@/blocks/registry' const mockGetBlock = getBlock as Mock diff --git a/apps/sim/lib/workflows/blocks/block-reference-tags.ts b/apps/sim/lib/workflows/blocks/reference-tags.ts similarity index 96% rename from apps/sim/lib/workflows/blocks/block-reference-tags.ts rename to apps/sim/lib/workflows/blocks/reference-tags.ts index a17ea4c4f86..57e1f1a8b6c 100644 --- a/apps/sim/lib/workflows/blocks/block-reference-tags.ts +++ b/apps/sim/lib/workflows/blocks/reference-tags.ts @@ -1,6 +1,6 @@ -import { getEffectiveBlockOutputPaths } from '@/lib/workflows/blocks/block-outputs' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { getEffectiveBlockOutputPaths } from '@/lib/workflows/blocks/outputs' import { TRIGGER_TYPES } from '@/lib/workflows/triggers/types' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { getBlock } from '@/blocks' import { isHumanInTheLoopBlock, normalizeName } from '@/executor/constants' diff --git a/apps/sim/lib/workflows/comparison/redact.ts b/apps/sim/lib/workflows/comparison/redact.ts index 14c3ac22888..336dfb51ae7 100644 --- a/apps/sim/lib/workflows/comparison/redact.ts +++ b/apps/sim/lib/workflows/comparison/redact.ts @@ -1,6 +1,6 @@ import type { WorkflowDiffSummary } from '@/lib/workflows/comparison/compare' import { normalizedStringify } from '@/lib/workflows/comparison/normalize' -import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor' +import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/extractor' import { getBlock } from '@/blocks/registry' import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types' diff --git a/apps/sim/lib/workflows/credentials/credential-extractor.test.ts b/apps/sim/lib/workflows/credentials/extractor.test.ts similarity index 98% rename from apps/sim/lib/workflows/credentials/credential-extractor.test.ts rename to apps/sim/lib/workflows/credentials/extractor.test.ts index 7f124d8efee..9b5a3ae3283 100644 --- a/apps/sim/lib/workflows/credentials/credential-extractor.test.ts +++ b/apps/sim/lib/workflows/credentials/extractor.test.ts @@ -7,7 +7,7 @@ import { collectStrippedWorkspaceBindings, EXPORT_PRESERVED_RESOURCE_TYPES, sanitizeWorkflowForSharing, -} from '@/lib/workflows/credentials/credential-extractor' +} from '@/lib/workflows/credentials/extractor' import { WORKFLOW_SEARCH_SUBBLOCK_RESOURCE_TYPES } from '@/lib/workflows/search-replace/resources/registry' import { getBlock } from '@/blocks/registry' import type { WorkflowState } from '@/stores/workflows/workflow/types' @@ -47,7 +47,7 @@ function stateWithSubBlock(type: string, value: unknown): Partial /** * The exact option set `json-sanitizer`'s `sanitizeForExport` passes, copied rather than imported - * so this suite keeps testing `credential-extractor` without pulling in its own consumer. + * so this suite keeps testing the credential extractor without pulling in its own consumer. * * The copy cannot drift unnoticed: `import-export-roundtrip` calls the real `sanitizeForExport` * and asserts the same withholding, so dropping an option there turns that suite red. Every diff --git a/apps/sim/lib/workflows/credentials/credential-extractor.ts b/apps/sim/lib/workflows/credentials/extractor.ts similarity index 100% rename from apps/sim/lib/workflows/credentials/credential-extractor.ts rename to apps/sim/lib/workflows/credentials/extractor.ts diff --git a/apps/sim/lib/workflows/custom-blocks/application/settings.test.ts b/apps/sim/lib/workflows/custom-blocks/application/settings.test.ts index 92c14605040..2097b82bedf 100644 --- a/apps/sim/lib/workflows/custom-blocks/application/settings.test.ts +++ b/apps/sim/lib/workflows/custom-blocks/application/settings.test.ts @@ -12,7 +12,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workflows/custom-blocks/operations', () => customBlockOperationsMock) vi.mock('@sim/audit', () => auditMock) diff --git a/apps/sim/lib/workflows/custom-blocks/application/settings.ts b/apps/sim/lib/workflows/custom-blocks/application/settings.ts index 2a33bce0c97..677c2b38103 100644 --- a/apps/sim/lib/workflows/custom-blocks/application/settings.ts +++ b/apps/sim/lib/workflows/custom-blocks/application/settings.ts @@ -20,7 +20,7 @@ import { type UpdateCustomBlockBody, updateCustomBlockBodySchema, } from '@/lib/workflows/custom-blocks/settings-input' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' // permission-group-exempt: custom block settings retain source-workspace administration and deployment entitlement policy. const base = { diff --git a/apps/sim/lib/workflows/custom-blocks/child-execution.ts b/apps/sim/lib/workflows/custom-blocks/child-execution.ts index bd591adaca8..c1726debb2b 100644 --- a/apps/sim/lib/workflows/custom-blocks/child-execution.ts +++ b/apps/sim/lib/workflows/custom-blocks/child-execution.ts @@ -1,5 +1,5 @@ import { createLogger } from '@sim/logger' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { combineExecutionAbortSignals } from '@/lib/core/execution-limits' diff --git a/apps/sim/lib/workflows/custom-blocks/operations.ts b/apps/sim/lib/workflows/custom-blocks/operations.ts index 3d901e70aa9..6eef5f64e01 100644 --- a/apps/sim/lib/workflows/custom-blocks/operations.ts +++ b/apps/sim/lib/workflows/custom-blocks/operations.ts @@ -348,7 +348,7 @@ export async function getCustomBlockManageContext(id: string): Promise<{ * It is NOT the identity for the two things a workspace owns. Workspace * variables authorize against the source workspace's billing account, and that * account is the payer, exactly as they would for a schedule on the same - * workflow — see the environment resolution in `workflow-handler`. Reading those + * workflow — see the environment resolution in `workflow/handler`. Reading those * as the owner too gave a published block a narrower workspace-secret selection * than the workflow got on every other trigger, which no consumer could see. */ diff --git a/apps/sim/lib/workflows/defaults.ts b/apps/sim/lib/workflows/defaults.ts index 4293a8daa54..827b5f6998e 100644 --- a/apps/sim/lib/workflows/defaults.ts +++ b/apps/sim/lib/workflows/defaults.ts @@ -1,5 +1,5 @@ import { generateId } from '@sim/utils/id' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' import { createDefaultInputFormatField } from '@/lib/workflows/input-format' import { getBlock } from '@/blocks' import type { BlockConfig, SubBlockConfig } from '@/blocks/types' diff --git a/apps/sim/lib/workflows/diff/diff-engine.test.ts b/apps/sim/lib/workflows/diff/engine.test.ts similarity index 98% rename from apps/sim/lib/workflows/diff/diff-engine.test.ts rename to apps/sim/lib/workflows/diff/engine.test.ts index f3c5a2f1987..0f2df825312 100644 --- a/apps/sim/lib/workflows/diff/diff-engine.test.ts +++ b/apps/sim/lib/workflows/diff/engine.test.ts @@ -51,7 +51,7 @@ vi.mock('@/tools/utils', () => toolsUtilsMock) vi.mock('@/triggers', () => triggersMock) -vi.mock('@/lib/workflows/blocks/block-outputs', () => ({ +vi.mock('@/lib/workflows/blocks/outputs', () => ({ getEffectiveBlockOutputs: () => ({}), })) @@ -86,7 +86,7 @@ vi.mock('@/stores/workflows/subblock/store', () => ({ }, })) -import { WorkflowDiffEngine } from './diff-engine' +import { WorkflowDiffEngine } from './engine' toolsUtilsMockFns.mockGetTool.mockReturnValue(null) triggersMockFns.mockGetTrigger.mockReturnValue(null) diff --git a/apps/sim/lib/workflows/diff/diff-engine.ts b/apps/sim/lib/workflows/diff/engine.ts similarity index 100% rename from apps/sim/lib/workflows/diff/diff-engine.ts rename to apps/sim/lib/workflows/diff/engine.ts diff --git a/apps/sim/lib/workflows/diff/index.ts b/apps/sim/lib/workflows/diff/index.ts index b04f2b5722f..ebbfb8a3439 100644 --- a/apps/sim/lib/workflows/diff/index.ts +++ b/apps/sim/lib/workflows/diff/index.ts @@ -1,2 +1,2 @@ -export type { DiffAnalysis, WorkflowDiff } from './diff-engine' -export { stripWorkflowDiffMarkers, WorkflowDiffEngine } from './diff-engine' +export type { DiffAnalysis, WorkflowDiff } from './engine' +export { stripWorkflowDiffMarkers, WorkflowDiffEngine } from './engine' diff --git a/apps/sim/lib/workflows/editing/builders.ts b/apps/sim/lib/workflows/editing/builders.ts index c4f9b90da9f..9552f4c8876 100644 --- a/apps/sim/lib/workflows/editing/builders.ts +++ b/apps/sim/lib/workflows/editing/builders.ts @@ -19,7 +19,7 @@ import { OPERATION_SUBBLOCK_ID, type SeedValueGate, } from '@/lib/permission-groups/operation-access' -import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/block-outputs' +import { getEffectiveBlockOutputs } from '@/lib/workflows/blocks/outputs' import { isRetryEligibleBlock } from '@/lib/workflows/blocks/retry-eligibility' import { buildCanonicalIndex, @@ -27,7 +27,7 @@ import { isCanonicalPair, } from '@/lib/workflows/subblocks/visibility' import { applyAgentToolUsageControlModes } from '@/lib/workflows/tool-input/usage-control' -import { hasTriggerCapability } from '@/lib/workflows/triggers/trigger-utils' +import { hasTriggerCapability } from '@/lib/workflows/triggers/utils' import { getBlock } from '@/blocks/registry' import type { BlockConfig, SubBlockConfig } from '@/blocks/types' import { overlayVisibility } from '@/blocks/visibility/context' diff --git a/apps/sim/lib/workflows/editing/lint.ts b/apps/sim/lib/workflows/editing/lint.ts index 032c5ebd979..d06f1878a4e 100644 --- a/apps/sim/lib/workflows/editing/lint.ts +++ b/apps/sim/lib/workflows/editing/lint.ts @@ -7,7 +7,7 @@ import { getEffectiveBlockOutputs, getEffectiveBlockOutputType, getResponseFormatOutputs, -} from '@/lib/workflows/blocks/block-outputs' +} from '@/lib/workflows/blocks/outputs' import { getBlock } from '@/blocks' import { isTriggerBlockType, diff --git a/apps/sim/lib/workflows/execution-admission.ts b/apps/sim/lib/workflows/execution-admission.ts index 2393355c68a..ba596ad5324 100644 --- a/apps/sim/lib/workflows/execution-admission.ts +++ b/apps/sim/lib/workflows/execution-admission.ts @@ -5,7 +5,7 @@ import { import { type BillingAttributionSnapshot, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { checkExecutionUsageLimits } from '@/lib/billing/core/usage-gate-cache' import { getReservationDenialDescriptor, diff --git a/apps/sim/lib/workflows/executor/enqueue-execution.ts b/apps/sim/lib/workflows/executor/enqueue-execution.ts index 0136fcbe08b..8c32ba067c2 100644 --- a/apps/sim/lib/workflows/executor/enqueue-execution.ts +++ b/apps/sim/lib/workflows/executor/enqueue-execution.ts @@ -2,7 +2,7 @@ import { serializePrincipal, type WorkflowExecutionPrincipal } from '@sim/auth/p import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs' import { isAsyncJobEnqueueError } from '@/lib/core/async-jobs/types' import { toTriggerMaxDurationSeconds } from '@/lib/core/execution-limits' diff --git a/apps/sim/lib/workflows/executor/execute-service.ts b/apps/sim/lib/workflows/executor/execute-service.ts index 069f0938de1..262f9cdfd84 100644 --- a/apps/sim/lib/workflows/executor/execute-service.ts +++ b/apps/sim/lib/workflows/executor/execute-service.ts @@ -5,7 +5,7 @@ import { getErrorMessage, toError } from '@sim/utils/errors' import { generateId, isValidUuid } from '@sim/utils/id' import type { BlockState } from '@sim/workflow-types/workflow' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { logFailureOnce } from '@/lib/core/errors/failure-log' import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits' import { SSE_HEADERS } from '@/lib/core/utils/sse' diff --git a/apps/sim/lib/workflows/executor/execute-workflow.test.ts b/apps/sim/lib/workflows/executor/execute-workflow.test.ts index 91b8b469382..21d89285647 100644 --- a/apps/sim/lib/workflows/executor/execute-workflow.test.ts +++ b/apps/sim/lib/workflows/executor/execute-workflow.test.ts @@ -5,7 +5,7 @@ import { loggingSessionMock, loggingSessionMockFns } from '@sim/testing/mocks/lo import { posthogServerMock } from '@sim/testing/mocks/posthog-server.mock' import { tableEventsMock } from '@sim/testing/mocks/table-events.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { ExecutionSnapshot } from '@/executor/execution/snapshot' import type { ExecutionCallbacks } from '@/executor/execution/types' import type { ResolvedSecretTraceProvenanceV1 } from '@/executor/utils/resolved-secret-trace-registry' diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts index 10167c86562..663b304d251 100644 --- a/apps/sim/lib/workflows/executor/execute-workflow.ts +++ b/apps/sim/lib/workflows/executor/execute-workflow.ts @@ -5,7 +5,7 @@ import { generateId } from '@sim/utils/id' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { LoggingSession } from '@/lib/logs/execution/logging-session' import { captureServerEvent } from '@/lib/posthog/server' diff --git a/apps/sim/lib/workflows/executor/execution-core.test.ts b/apps/sim/lib/workflows/executor/execution-core.test.ts index ca2f5ec5c2d..e0f03e17d7b 100644 --- a/apps/sim/lib/workflows/executor/execution-core.test.ts +++ b/apps/sim/lib/workflows/executor/execution-core.test.ts @@ -109,7 +109,7 @@ const { connectExecutionSignalHubMock } = vi.hoisted(() => ({ connectExecutionSignalHubMock: vi.fn(), })) -vi.mock('@/lib/execution/execution-signal', () => ({ +vi.mock('@/lib/execution/signal', () => ({ connectExecutionSignalHub: connectExecutionSignalHubMock, })) diff --git a/apps/sim/lib/workflows/executor/execution-core.ts b/apps/sim/lib/workflows/executor/execution-core.ts index e5e1a8780fe..d6722ca5394 100644 --- a/apps/sim/lib/workflows/executor/execution-core.ts +++ b/apps/sim/lib/workflows/executor/execution-core.ts @@ -29,10 +29,10 @@ import { getExecutionEnvironment, } from '@/lib/environment/utils' import { clearExecutionCancellation } from '@/lib/execution/cancellation' -import { connectExecutionSignalHub } from '@/lib/execution/execution-signal' import { getStoredFileReferenceScope, processInputFileFields } from '@/lib/execution/files' import { warmLargeValueRefs } from '@/lib/execution/payloads/hydration' import { parseLargeExecutionValue } from '@/lib/execution/payloads/large-execution-value' +import { connectExecutionSignalHub } from '@/lib/execution/signal' import type { LoggingSession } from '@/lib/logs/execution/logging-session' import { redactLargeValueRefsInValue } from '@/lib/logs/execution/pii-large-values' import { redactObjectStrings } from '@/lib/logs/execution/pii-redaction' diff --git a/apps/sim/lib/workflows/executor/execution-run-files.ts b/apps/sim/lib/workflows/executor/execution-run-files.ts index f67d85db851..84f71e6c5b3 100644 --- a/apps/sim/lib/workflows/executor/execution-run-files.ts +++ b/apps/sim/lib/workflows/executor/execution-run-files.ts @@ -7,7 +7,7 @@ import { collectUserFilesById } from '@/lib/core/utils/user-file' import { MAX_INLINE_MATERIALIZATION_BYTES } from '@/lib/execution/payloads/limits' import { materializeExecutionData } from '@/lib/logs/execution/trace-store' import { downloadFile } from '@/lib/uploads/core/storage-service' -import { formatFileSize, inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { formatFileSize, inferContextFromKey } from '@/lib/uploads/utils/file' import { isRunOutputFileKey } from '@/lib/workflows/executor/run-file-scope' import { classifyRunFileStorageError } from '@/lib/workflows/executor/run-file-storage-error' import type { UserFile } from '@/executor/types' diff --git a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.test.ts b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.test.ts index 7b8f7081aca..9ab85e78bd2 100644 --- a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.test.ts +++ b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.test.ts @@ -18,8 +18,8 @@ import { largeValueMetadataMock } from '@sim/testing/mocks/large-value-metadata. import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { createTimeoutAbortController, getExecutionDeadlineAt } from '@/lib/core/execution-limits' import { markExecutionCancelled } from '@/lib/execution/cancellation' -import { getExecutionSignalHub } from '@/lib/execution/execution-signal' import { abortManualExecution } from '@/lib/execution/manual-cancellation' +import { getExecutionSignalHub } from '@/lib/execution/signal' import { terminalExecutionLogFields } from '@/lib/logs/execution/cancellation' import { LoggingSession } from '@/lib/logs/execution/logging-session' diff --git a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts index db927c850b9..51a3a23d8d2 100644 --- a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts +++ b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts @@ -7,7 +7,7 @@ import { isRecordLike, omit, toRecord } from '@sim/utils/object' import type { Edge } from '@xyflow/react' import { and, asc, desc, eq, inArray, lt, type SQL, sql } from 'drizzle-orm' import { releaseExecutionSlot } from '@/lib/billing/calculations/usage-reservation' -import { assertBillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import { assertBillingAttributionSnapshot } from '@/lib/billing/core/attribution' import { createTimeoutAbortController, getAsyncExecutionTimeoutForBillingAttribution, diff --git a/apps/sim/lib/workflows/executor/pause-persistence.integration.ts b/apps/sim/lib/workflows/executor/pause-persistence.integration.ts index be02edfa899..90abb753337 100644 --- a/apps/sim/lib/workflows/executor/pause-persistence.integration.ts +++ b/apps/sim/lib/workflows/executor/pause-persistence.integration.ts @@ -19,7 +19,7 @@ import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' import { type BillingAttributionSnapshot, resolveBillingAttribution, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { LoggingSession } from '@/lib/logs/execution/logging-session' import type { WorkflowState } from '@/lib/logs/types' import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager' diff --git a/apps/sim/lib/workflows/executor/paused-execution-metadata.ts b/apps/sim/lib/workflows/executor/paused-execution-metadata.ts index a2e41b64adc..4098bdecfe3 100644 --- a/apps/sim/lib/workflows/executor/paused-execution-metadata.ts +++ b/apps/sim/lib/workflows/executor/paused-execution-metadata.ts @@ -2,7 +2,7 @@ import { isRecordLike } from '@sim/utils/object' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { type AutomaticResumeWaitingMetadata, normalizeAutomaticResumeWaitingReason, diff --git a/apps/sim/lib/workflows/executor/resume-execution.ts b/apps/sim/lib/workflows/executor/resume-execution.ts index 2f54fc33dd4..7200c57c9e4 100644 --- a/apps/sim/lib/workflows/executor/resume-execution.ts +++ b/apps/sim/lib/workflows/executor/resume-execution.ts @@ -5,7 +5,7 @@ import { isRecordLike } from '@sim/utils/object' import { assertBillingAttributionSnapshot, type BillingAttributionSnapshot, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs' import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types' import { toTriggerMaxDurationSeconds } from '@/lib/core/execution-limits' diff --git a/apps/sim/lib/workflows/input-format.ts b/apps/sim/lib/workflows/input-format.ts index 46a2298c513..dd0682ab302 100644 --- a/apps/sim/lib/workflows/input-format.ts +++ b/apps/sim/lib/workflows/input-format.ts @@ -1,5 +1,5 @@ import { generateId } from '@sim/utils/id' -import { isInternalFileUrl, parseInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl, parseInternalFileUrl } from '@/lib/uploads/utils/file' import type { InputFormatFieldState } from '@/lib/workflows/input-format-schema' import { isInputDefinitionTrigger } from '@/lib/workflows/triggers/input-definition-triggers' import type { InputFormatField } from '@/lib/workflows/types' diff --git a/apps/sim/lib/workflows/workflow-labels.ts b/apps/sim/lib/workflows/labels.ts similarity index 100% rename from apps/sim/lib/workflows/workflow-labels.ts rename to apps/sim/lib/workflows/labels.ts diff --git a/apps/sim/lib/workflows/operations/import-export-roundtrip.test.ts b/apps/sim/lib/workflows/operations/import-export-roundtrip.test.ts index e1149e3dc0b..bc79989fa2a 100644 --- a/apps/sim/lib/workflows/operations/import-export-roundtrip.test.ts +++ b/apps/sim/lib/workflows/operations/import-export-roundtrip.test.ts @@ -185,7 +185,7 @@ describe('workflow export -> import round trip', () => { * The round trip is deliberately NOT lossless, and these assertions exist so that stops being a * surprise. `sanitizeForExport` passes `redactOpaqueCredentialInputs`, which withholds whole * `table` values and every parameter of a tool with no authoritative codec metadata — see the - * trade recorded on `OPAQUE_CREDENTIAL_BEARING_TYPES` in `credential-extractor`. + * trade recorded on `OPAQUE_CREDENTIAL_BEARING_TYPES` in `credentials/extractor`. * * Both classes carry secrets no per-field rule can find (a bearer token pasted into a header * cell, a key in a custom tool's params) and both also carry ordinary configuration, which goes diff --git a/apps/sim/lib/workflows/operations/import-workflow.ts b/apps/sim/lib/workflows/operations/import-workflow.ts index 72f32b975e4..72454ca8bec 100644 --- a/apps/sim/lib/workflows/operations/import-workflow.ts +++ b/apps/sim/lib/workflows/operations/import-workflow.ts @@ -16,7 +16,7 @@ import { } from '@/lib/api/contracts/v1/workflows' import { workflowStateSchema } from '@/lib/api/contracts/workflows' import { serializeZodIssues } from '@/lib/api/server' -import { collectStrippedWorkspaceBindings } from '@/lib/workflows/credentials/credential-extractor' +import { collectStrippedWorkspaceBindings } from '@/lib/workflows/credentials/extractor' import { parseWorkflowJson } from '@/lib/workflows/operations/import-export' import { type PerformCreateWorkflowParams, diff --git a/apps/sim/lib/workflows/operations/socket-operations.ts b/apps/sim/lib/workflows/operations/socket-operations.ts index 81b07832001..f1d86ea6b87 100644 --- a/apps/sim/lib/workflows/operations/socket-operations.ts +++ b/apps/sim/lib/workflows/operations/socket-operations.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sim/logger' import { generateId } from '@sim/utils/id' -import { client } from '@/lib/auth/auth-client' +import { client } from '@/lib/auth/client' import { useOperationQueueStore } from '@/stores/operation-queue/store' import type { WorkflowState } from '@/stores/workflows/workflow/types' import { normalizeWorkflowState } from '@/stores/workflows/workflow/validation' diff --git a/apps/sim/lib/workflows/references/dependent-reconfigs.ts b/apps/sim/lib/workflows/references/dependent-reconfigs.ts index a4dca9feef0..bf7a386003b 100644 --- a/apps/sim/lib/workflows/references/dependent-reconfigs.ts +++ b/apps/sim/lib/workflows/references/dependent-reconfigs.ts @@ -1,12 +1,12 @@ import { isRecordLike, toRecord } from '@sim/utils/object' import type { ForkDependentReconfig, ForkResourceUsage } from '@/lib/api/contracts/workspace-fork' import { coerceObjectArray } from '@/lib/workflows/persistence/remap-internal-ids' -import { toScannerBlocks } from '@/lib/workflows/references/reference-scan' import { createCanonicalModeGates, reconfigurableDependentIds, scanWorkflowReferences, } from '@/lib/workflows/references/remap-references' +import { toScannerBlocks } from '@/lib/workflows/references/scan' import type { WorkflowBlockIdResolver } from '@/lib/workflows/references/types' import { getToolInputParamConfigs } from '@/lib/workflows/search-replace/indexer' import { diff --git a/apps/sim/lib/workflows/references/reference-scan.ts b/apps/sim/lib/workflows/references/scan.ts similarity index 100% rename from apps/sim/lib/workflows/references/reference-scan.ts rename to apps/sim/lib/workflows/references/scan.ts diff --git a/apps/sim/lib/workflows/sanitization/json-sanitizer.ts b/apps/sim/lib/workflows/sanitization/json-sanitizer.ts index 44c71007b86..68c38e06e46 100644 --- a/apps/sim/lib/workflows/sanitization/json-sanitizer.ts +++ b/apps/sim/lib/workflows/sanitization/json-sanitizer.ts @@ -6,7 +6,7 @@ import { import { normalizeWorkflowEdgeSourceHandle } from '@sim/workflow-types/workflow' import type { Edge } from '@xyflow/react' import { buildWebhookTriggerUrl } from '@/lib/webhooks/trigger-url' -import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/credential-extractor' +import { sanitizeWorkflowForSharing } from '@/lib/workflows/credentials/extractor' import { getBlock } from '@/blocks/registry' import type { BlockRetryConfig, diff --git a/apps/sim/lib/workflows/streaming/streaming-principal.test.ts b/apps/sim/lib/workflows/streaming/selected-output-principal.test.ts similarity index 100% rename from apps/sim/lib/workflows/streaming/streaming-principal.test.ts rename to apps/sim/lib/workflows/streaming/selected-output-principal.test.ts diff --git a/apps/sim/lib/workflows/subblocks/display.ts b/apps/sim/lib/workflows/subblocks/display.ts index 6e53946e57c..e22f57a9942 100644 --- a/apps/sim/lib/workflows/subblocks/display.ts +++ b/apps/sim/lib/workflows/subblocks/display.ts @@ -12,7 +12,7 @@ import { parseFolderPath } from '@/lib/folders/paths' import { readFolderPaths } from '@/lib/folders/selection' import { MCP_SERVER_ADVANCED_TOOL_TYPE } from '@/lib/mcp/shared' import type { FilterRule, SortRule } from '@/lib/table/types' -import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/workflow-labels' +import { DELETED_WORKFLOW_LABEL } from '@/lib/workflows/labels' import { getBlock } from '@/blocks' import type { SubBlockConfig } from '@/blocks/types' diff --git a/apps/sim/lib/workflows/triggers/mock-payload.ts b/apps/sim/lib/workflows/triggers/mock-payload.ts index 23bd9cc9bc8..8684f728827 100644 --- a/apps/sim/lib/workflows/triggers/mock-payload.ts +++ b/apps/sim/lib/workflows/triggers/mock-payload.ts @@ -5,7 +5,7 @@ import { isRecordLike } from '@sim/utils/object' * * Deliberately dependency-free. `@/triggers` imports this module, so anything reachable * from here becomes reachable from the trigger barrel — and reaching `@/blocks` (directly, - * or via `trigger-utils`) recreates the `triggers` <-> `blocks` initialization cycle that + * or via `triggers/utils`) recreates the `triggers` <-> `blocks` initialization cycle that * `scripts/check-trigger-block-cycle.ts` guards against. */ diff --git a/apps/sim/lib/workflows/triggers/run-options.ts b/apps/sim/lib/workflows/triggers/run-options.ts index ccba0ec5d9b..39d3b418408 100644 --- a/apps/sim/lib/workflows/triggers/run-options.ts +++ b/apps/sim/lib/workflows/triggers/run-options.ts @@ -1,23 +1,20 @@ import { isRecordLike } from '@sim/utils/object' import { z } from 'zod' import { generateToolInputSchema } from '@/lib/mcp/workflow-tool-schema' -import { parseInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { parseInternalFileUrl } from '@/lib/uploads/utils/file' import { isFileFieldType, normalizeInputFormatValue, parseInputFormatFiles, } from '@/lib/workflows/input-format' import { generateWorkflowInputShape } from '@/lib/workflows/input-schema' -import { - extractTriggerMockPayload, - selectBestTrigger, -} from '@/lib/workflows/triggers/trigger-utils' import { getLegacyStarterMode, resolveStartCandidates, type StartBlockCandidate, StartBlockPath, } from '@/lib/workflows/triggers/triggers' +import { extractTriggerMockPayload, selectBestTrigger } from '@/lib/workflows/triggers/utils' import type { InputFormatField } from '@/lib/workflows/types' import { getBlock } from '@/blocks' import { coerceValue } from '@/executor/utils/start-block' diff --git a/apps/sim/lib/workflows/triggers/trigger-utils.server.ts b/apps/sim/lib/workflows/triggers/utils.server.ts similarity index 97% rename from apps/sim/lib/workflows/triggers/trigger-utils.server.ts rename to apps/sim/lib/workflows/triggers/utils.server.ts index caca2ba1f33..6d1b20611f7 100644 --- a/apps/sim/lib/workflows/triggers/trigger-utils.server.ts +++ b/apps/sim/lib/workflows/triggers/utils.server.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sim/logger' import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils' -import { hasValidStartBlockInState } from '@/lib/workflows/triggers/trigger-utils' +import { hasValidStartBlockInState } from '@/lib/workflows/triggers/utils' const logger = createLogger('TriggerUtils') diff --git a/apps/sim/lib/workflows/triggers/trigger-utils.ts b/apps/sim/lib/workflows/triggers/utils.ts similarity index 100% rename from apps/sim/lib/workflows/triggers/trigger-utils.ts rename to apps/sim/lib/workflows/triggers/utils.ts diff --git a/apps/sim/lib/workflows/variables/variable-manager.test.ts b/apps/sim/lib/workflows/variables/manager.test.ts similarity index 98% rename from apps/sim/lib/workflows/variables/variable-manager.test.ts rename to apps/sim/lib/workflows/variables/manager.test.ts index 8fbc3afe5d5..7c229c5ca76 100644 --- a/apps/sim/lib/workflows/variables/variable-manager.test.ts +++ b/apps/sim/lib/workflows/variables/manager.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { VariableManager } from '@/lib/workflows/variables/variable-manager' +import { VariableManager } from '@/lib/workflows/variables/manager' describe('VariableManager', () => { describe('parseInputForStorage', () => { diff --git a/apps/sim/lib/workflows/variables/variable-manager.ts b/apps/sim/lib/workflows/variables/manager.ts similarity index 100% rename from apps/sim/lib/workflows/variables/variable-manager.ts rename to apps/sim/lib/workflows/variables/manager.ts diff --git a/apps/sim/lib/workspace-files/__integration__/copilot-file-versions.integration.ts b/apps/sim/lib/workspace-files/__integration__/copilot-file-versions.integration.ts index dae19c5f9a2..cc10a685eaf 100644 --- a/apps/sim/lib/workspace-files/__integration__/copilot-file-versions.integration.ts +++ b/apps/sim/lib/workspace-files/__integration__/copilot-file-versions.integration.ts @@ -44,8 +44,8 @@ import { createCopilotChatPrincipal } from '@/lib/mothership/auth/application-de import { updateWorkspaceFileContent, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization' import { downloadWorkspaceFileStream } from '@/lib/workspace-files/application/download-workspace-file' import { projectResolvedSecretModelContent } from '@/executor/utils/resolved-secret-content-projection' diff --git a/apps/sim/lib/workspace-files/api/internal-analytics.ts b/apps/sim/lib/workspace-files/api/internal-analytics.ts index 9f5dd8a5655..588134827c1 100644 --- a/apps/sim/lib/workspace-files/api/internal-analytics.ts +++ b/apps/sim/lib/workspace-files/api/internal-analytics.ts @@ -11,15 +11,15 @@ import type { DownloadWorkspaceFileItemsInput, DownloadWorkspaceFileItemsResult, } from '@/lib/workspace-files/application/download-workspace-file-items' -import type { MoveWorkspaceFileItemsInput } from '@/lib/workspace-files/application/move-workspace-file-items' -import type { RenameWorkspaceFileResult } from '@/lib/workspace-files/application/rename-workspace-file' import type { CreateWorkspaceFileFolderInput, DeleteWorkspaceFileFolderInput, RestoreWorkspaceFileFolderInput, RestoreWorkspaceFileFolderResult, UpdateWorkspaceFileFolderInput, -} from '@/lib/workspace-files/application/workspace-file-folders' +} from '@/lib/workspace-files/application/folders' +import type { MoveWorkspaceFileItemsInput } from '@/lib/workspace-files/application/move-workspace-file-items' +import type { RenameWorkspaceFileResult } from '@/lib/workspace-files/application/rename-workspace-file' interface InternalSuccessArgs { principal: SessionPrincipal diff --git a/apps/sim/lib/workspace-files/api/text-presenter.ts b/apps/sim/lib/workspace-files/api/text-presenter.ts index c7db2cb6fab..10aab8ffb60 100644 --- a/apps/sim/lib/workspace-files/api/text-presenter.ts +++ b/apps/sim/lib/workspace-files/api/text-presenter.ts @@ -1,4 +1,4 @@ -import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace/file-manager' import type { ReadWorkspaceFileTextResult } from '@/lib/workspace-files/application/read-workspace-file-text' /** The CLI and HTTP surface expose text metadata, never the private provenance sidecar. */ diff --git a/apps/sim/lib/workspace-files/application/admit-file-content.ts b/apps/sim/lib/workspace-files/application/admit-file-content.ts index 8f0d1de4658..91d4c24660d 100644 --- a/apps/sim/lib/workspace-files/application/admit-file-content.ts +++ b/apps/sim/lib/workspace-files/application/admit-file-content.ts @@ -12,7 +12,7 @@ import { getBoundWorkspaceFileSecretProvenanceByIdentity, type WorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenanceIdentity, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import type { OwnedFileContext, OwnedFileNamespace } from '@/lib/workspace-files/owned-files' /** What a classification is bound to; a workspace file record satisfies it. */ diff --git a/apps/sim/lib/workspace-files/application/create-workspace-file.ts b/apps/sim/lib/workspace-files/application/create-workspace-file.ts index 9f7810d5fb4..25f63343d67 100644 --- a/apps/sim/lib/workspace-files/application/create-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/create-workspace-file.ts @@ -10,8 +10,8 @@ import { uploadWorkspaceFile, type WorkspaceFileRecord, } from '@/lib/uploads/contexts/workspace' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' import { fileOperations } from '@/lib/workspace-files/application/operations' import { MAX_WORKSPACE_FILE_CONTENT_BYTES } from '@/lib/workspace-files/orchestration' diff --git a/apps/sim/lib/workspace-files/application/delete-workspace-file.ts b/apps/sim/lib/workspace-files/application/delete-workspace-file.ts index 4ff30446cb3..d32481db2b3 100644 --- a/apps/sim/lib/workspace-files/application/delete-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/delete-workspace-file.ts @@ -5,10 +5,10 @@ import { notifyWorkspaceFilesChanged } from '@/lib/realtime/notify' import { type ActiveWorkspaceFileContext, deleteWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' const logger = createLogger('DeleteWorkspaceFile') diff --git a/apps/sim/lib/workspace-files/application/download-workspace-file-items.test.ts b/apps/sim/lib/workspace-files/application/download-workspace-file-items.test.ts index 19d10a8b0b2..6c4eaad3245 100644 --- a/apps/sim/lib/workspace-files/application/download-workspace-file-items.test.ts +++ b/apps/sim/lib/workspace-files/application/download-workspace-file-items.test.ts @@ -37,14 +37,14 @@ vi.mock('@/lib/workspace-files/application/fetch-servable-workspace-file-buffer' fetchAuthorizedServableWorkspaceFileBuffer: mockFetchServable, })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) vi.mock('@/lib/uploads/utils/doc-not-ready', () => ({ docNotReadyMessage: (names: string[]) => `Pending: ${names.join(', ')}`, isDocNotReadyError: mockIsDocNotReady, })) vi.mock('@sim/audit', () => auditMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/download-workspace-file-items.ts b/apps/sim/lib/workspace-files/application/download-workspace-file-items.ts index b5ef60ad4af..24326849656 100644 --- a/apps/sim/lib/workspace-files/application/download-workspace-file-items.ts +++ b/apps/sim/lib/workspace-files/application/download-workspace-file-items.ts @@ -20,7 +20,7 @@ import { formatFileSize, MAX_RENDERED_DOCUMENT_BYTES, needsRenderedArtifact, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { admitContributors, admitWorkspaceFiles, diff --git a/apps/sim/lib/workspace-files/application/download-workspace-file.test.ts b/apps/sim/lib/workspace-files/application/download-workspace-file.test.ts index 5b3a5376fe1..b002a7dd1be 100644 --- a/apps/sim/lib/workspace-files/application/download-workspace-file.test.ts +++ b/apps/sim/lib/workspace-files/application/download-workspace-file.test.ts @@ -33,7 +33,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/workspace-files/application/fetch-servable-workspace-file-buffer', () => ({ fetchAuthorizedServableWorkspaceFileBuffer: hoisted.fetchServable, @@ -46,7 +46,7 @@ vi.mock('@/lib/uploads/utils/doc-not-ready', () => ({ docNotReadyMessage: () => 'A document is still being generated.', })) -import { MAX_RENDERED_DOCUMENT_BYTES } from '@/lib/uploads/utils/file-utils' +import { MAX_RENDERED_DOCUMENT_BYTES } from '@/lib/uploads/utils/file' import { downloadWorkspaceFileStream } from '@/lib/workspace-files/application/download-workspace-file' const mocks = { @@ -249,6 +249,6 @@ describe('workspace file downloads', () => { }) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/download-workspace-file.ts b/apps/sim/lib/workspace-files/application/download-workspace-file.ts index 279b013eb47..7c57b67de71 100644 --- a/apps/sim/lib/workspace-files/application/download-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/download-workspace-file.ts @@ -6,17 +6,17 @@ import { nodeReadableToWebStream } from '@/lib/core/utils/node-stream' import { type ActiveWorkspaceFileContext, getWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { downloadFileStream } from '@/lib/uploads/core/storage-service' -import { MAX_RENDERED_DOCUMENT_BYTES, needsRenderedArtifact } from '@/lib/uploads/utils/file-utils' +import { MAX_RENDERED_DOCUMENT_BYTES, needsRenderedArtifact } from '@/lib/uploads/utils/file' import { requireAdmittedContributors, requireAdmittedWorkspaceFile, } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' import { resolveRenderedWorkspaceArtifact } from '@/lib/workspace-files/application/resolve-rendered-workspace-artifact' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface DownloadWorkspaceFileInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/edit-workspace-file-content.test.ts b/apps/sim/lib/workspace-files/application/edit-workspace-file-content.test.ts index 1df7b0a6f53..e5e492fe2b4 100644 --- a/apps/sim/lib/workspace-files/application/edit-workspace-file-content.test.ts +++ b/apps/sim/lib/workspace-files/application/edit-workspace-file-content.test.ts @@ -28,7 +28,7 @@ vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) * The context resolver imports straight from the manager, not the barrel, so * mocking only one of the two leaves the branch under test unreachable. */ -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/workspace-files/application/edit-workspace-file-content.ts b/apps/sim/lib/workspace-files/application/edit-workspace-file-content.ts index 00ed639b85c..2b99db56fca 100644 --- a/apps/sim/lib/workspace-files/application/edit-workspace-file-content.ts +++ b/apps/sim/lib/workspace-files/application/edit-workspace-file-content.ts @@ -15,14 +15,14 @@ import { updateWorkspaceFileContent as updateStoredWorkspaceFileContent, type VersionedWorkspaceFileRecord, } from '@/lib/uploads/contexts/workspace' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { requireAdmittedWorkspaceFile } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { parseWorkspaceFileRevision } from '@/lib/workspace-files/application/file-revision' import { resolveWorkspaceFileVersionWrite } from '@/lib/workspace-files/application/file-version-write' import { fileOperations } from '@/lib/workspace-files/application/operations' import { prepareOwnedFileContentWrite } from '@/lib/workspace-files/application/owned-file-content' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' import { applyWorkspaceFileContentEdit, countLines, diff --git a/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.test.ts b/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.test.ts index 66cf8c95e41..61db913afd5 100644 --- a/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.test.ts +++ b/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.test.ts @@ -18,7 +18,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@sim/audit', () => auditMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) import { exportWorkspaceFileSnapshot } from '@/lib/workspace-files/application/export-workspace-file-snapshot' diff --git a/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.ts b/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.ts index e58263566ec..486057f09c3 100644 --- a/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.ts +++ b/apps/sim/lib/workspace-files/application/export-workspace-file-snapshot.ts @@ -4,15 +4,15 @@ import { PASTE_LIMITS, utf8ByteLength } from '@sim/utils/paste' import { admitContent } from '@/lib/core/application' import { asOrchestrationError, OrchestrationError } from '@/lib/core/orchestration/types' import { MATERIALIZE_CONCURRENCY, mapWithConcurrency } from '@/lib/core/utils/concurrency' -import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { extractEmbeddedFileRefs } from '@/lib/uploads/server/embedded-image-refs' import { createMarkdownExport, MarkdownExportSizeError } from '@/lib/uploads/server/markdown-export' import { storedFileId } from '@/lib/uploads/utils/embedded-image-ref' -import { isMarkdownFile } from '@/lib/uploads/utils/file-utils' +import { isMarkdownFile } from '@/lib/uploads/utils/file' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' import { downloadWorkspaceFileRecord } from '@/lib/workspace-files/application/read-workspace-file-record' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ExportWorkspaceFileSnapshotInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/extract-workspace-file.test.ts b/apps/sim/lib/workspace-files/application/extract-workspace-file.test.ts index ec68b992e45..2b3ca630d32 100644 --- a/apps/sim/lib/workspace-files/application/extract-workspace-file.test.ts +++ b/apps/sim/lib/workspace-files/application/extract-workspace-file.test.ts @@ -41,15 +41,12 @@ vi.mock('@/lib/uploads/archive', () => ({ MAX_ARCHIVE_BYTES: 100 * 1024 * 1024, })) -vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', - () => workspaceFileFoldersMock -) +vi.mock('@/lib/uploads/contexts/workspace/file-folder-manager', () => workspaceFileFoldersMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/extract-workspace-file.ts b/apps/sim/lib/workspace-files/application/extract-workspace-file.ts index e1fdc964ad7..9dcf6d60e70 100644 --- a/apps/sim/lib/workspace-files/application/extract-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/extract-workspace-file.ts @@ -10,17 +10,17 @@ import { decompressArchiveBufferToWorkspaceFiles, MAX_ARCHIVE_BYTES } from '@/li import { archiveWorkspaceFileFolderIfEmpty, createWorkspaceFileFolder, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { type ActiveWorkspaceFileContext, fetchWorkspaceFileBuffer, getWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { getBoundWorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' -import { isArchiveFileName } from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { getBoundWorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' +import { isArchiveFileName } from '@/lib/uploads/utils/file' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' const logger = createLogger('ExtractWorkspaceFile') diff --git a/apps/sim/lib/workspace-files/application/fetch-servable-workspace-file-buffer.ts b/apps/sim/lib/workspace-files/application/fetch-servable-workspace-file-buffer.ts index ecdfee41b1c..30304f6f85e 100644 --- a/apps/sim/lib/workspace-files/application/fetch-servable-workspace-file-buffer.ts +++ b/apps/sim/lib/workspace-files/application/fetch-servable-workspace-file-buffer.ts @@ -3,10 +3,7 @@ import { createLogger } from '@sim/logger' import { getErrorMessage } from '@sim/utils/errors' import { generateRequestId } from '@/lib/core/utils/request' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' -import { - downloadServableFileFromStorage, - type ServableFile, -} from '@/lib/uploads/utils/file-utils.server' +import { downloadServableFileFromStorage, type ServableFile } from '@/lib/uploads/utils/file.server' import { requeueFileSearchForRenderedArtifact } from '@/lib/workspace-files/search/artifact-ready' const logger = createLogger('FetchServableWorkspaceFileBuffer') diff --git a/apps/sim/lib/workspace-files/application/workspace-file-context.ts b/apps/sim/lib/workspace-files/application/file-context.ts similarity index 97% rename from apps/sim/lib/workspace-files/application/workspace-file-context.ts rename to apps/sim/lib/workspace-files/application/file-context.ts index 4b150e251ec..e9be9300b34 100644 --- a/apps/sim/lib/workspace-files/application/workspace-file-context.ts +++ b/apps/sim/lib/workspace-files/application/file-context.ts @@ -6,7 +6,7 @@ import { loadActiveWorkspaceFileContext, loadWorkspaceFileLifecycleContext, type WorkspaceFileLifecycleContext, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { ownedFileKind } from '@/lib/workspace-files/owned-files' export interface WorkspaceFileContextInput { diff --git a/apps/sim/lib/workspace-files/application/file-version-write.ts b/apps/sim/lib/workspace-files/application/file-version-write.ts index 7bea84114cc..a44bb4ce4b1 100644 --- a/apps/sim/lib/workspace-files/application/file-version-write.ts +++ b/apps/sim/lib/workspace-files/application/file-version-write.ts @@ -1,6 +1,6 @@ import { type Principal, resolvePrincipalAuditAttribution } from '@sim/auth/principal' import type { WorkspaceFileVersionSource } from '@sim/db/schema' -import type { WorkspaceFileVersionWrite } from '@/lib/uploads/contexts/workspace/workspace-file-versions' +import type { WorkspaceFileVersionWrite } from '@/lib/uploads/contexts/workspace/file-version-store' function versionSourceForPrincipal(principal: Principal): WorkspaceFileVersionSource { switch (principal.kind) { diff --git a/apps/sim/lib/workspace-files/application/file-versions.test.ts b/apps/sim/lib/workspace-files/application/file-versions.test.ts index 6f82612b283..8c2ff3e8e28 100644 --- a/apps/sim/lib/workspace-files/application/file-versions.test.ts +++ b/apps/sim/lib/workspace-files/application/file-versions.test.ts @@ -25,9 +25,9 @@ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-versions', () => ({ +vi.mock('@/lib/uploads/contexts/workspace/file-version-store', () => ({ getCurrentWorkspaceFileVersion: hoisted.getCurrentVersion, getWorkspaceFileVersion: hoisted.getVersion, getWorkspaceFileVersionProvenance: hoisted.getProvenance, diff --git a/apps/sim/lib/workspace-files/application/file-versions.ts b/apps/sim/lib/workspace-files/application/file-versions.ts index 7632af4f079..c90fb29f36c 100644 --- a/apps/sim/lib/workspace-files/application/file-versions.ts +++ b/apps/sim/lib/workspace-files/application/file-versions.ts @@ -19,17 +19,17 @@ import { getBoundWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, workspaceFileSecretProvenanceFromSnapshot, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { getCurrentWorkspaceFileVersion, getWorkspaceFileVersion, getWorkspaceFileVersionProvenance, queryWorkspaceFileVersions, type WorkspaceFileVersionRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-versions' +} from '@/lib/uploads/contexts/workspace/file-version-store' import { hasObjectNotFoundCause } from '@/lib/uploads/core/errors' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' -import { formatFileSize } from '@/lib/uploads/utils/file-utils' +import { formatFileSize } from '@/lib/uploads/utils/file' import { requireAdmittedWorkspaceFile, workspaceFileProvenanceIdentity, @@ -39,6 +39,7 @@ import { type DownloadWorkspaceFileStreamResult, streamWorkspaceFileRecord, } from '@/lib/workspace-files/application/download-workspace-file' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { parseWorkspaceFileRevision } from '@/lib/workspace-files/application/file-revision' import { resolveWorkspaceFileVersionWrite } from '@/lib/workspace-files/application/file-version-write' import { fileOperations } from '@/lib/workspace-files/application/operations' @@ -48,7 +49,6 @@ import { type ReadWorkspaceFileTextInput, type ReadWorkspaceFileTextResult, } from '@/lib/workspace-files/application/read-workspace-file-text' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' const logger = createLogger('WorkspaceFileVersions') diff --git a/apps/sim/lib/workspace-files/application/workspace-file-folders.test.ts b/apps/sim/lib/workspace-files/application/folders.test.ts similarity index 99% rename from apps/sim/lib/workspace-files/application/workspace-file-folders.test.ts rename to apps/sim/lib/workspace-files/application/folders.test.ts index f286cfcf654..b136542392e 100644 --- a/apps/sim/lib/workspace-files/application/workspace-file-folders.test.ts +++ b/apps/sim/lib/workspace-files/application/folders.test.ts @@ -28,7 +28,7 @@ import { listWorkspaceFileFoldersOperation, resolveWorkspaceFileFolderPathOperation, restoreWorkspaceFileFolderOperation, -} from '@/lib/workspace-files/application/workspace-file-folders' +} from '@/lib/workspace-files/application/folders' const mockAssertItems = workspaceUploadsMockFns.mockAssertWorkspaceFileItemsBelongToWorkspace const mockArchive = workspaceUploadsMockFns.mockBulkArchiveWorkspaceFileItems diff --git a/apps/sim/lib/workspace-files/application/workspace-file-folders.ts b/apps/sim/lib/workspace-files/application/folders.ts similarity index 100% rename from apps/sim/lib/workspace-files/application/workspace-file-folders.ts rename to apps/sim/lib/workspace-files/application/folders.ts diff --git a/apps/sim/lib/workspace-files/application/list-workspace-files.test.ts b/apps/sim/lib/workspace-files/application/list-workspace-files.test.ts index d41347814bf..9502be504fb 100644 --- a/apps/sim/lib/workspace-files/application/list-workspace-files.test.ts +++ b/apps/sim/lib/workspace-files/application/list-workspace-files.test.ts @@ -18,7 +18,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) vi.mock('@/lib/workspace-files/resolve-folder-scope', () => ({ resolveWorkspaceFolderScope: hoisted.resolveFolderScope, diff --git a/apps/sim/lib/workspace-files/application/list-workspace-files.ts b/apps/sim/lib/workspace-files/application/list-workspace-files.ts index 39aa01f21b2..f9c54c54304 100644 --- a/apps/sim/lib/workspace-files/application/list-workspace-files.ts +++ b/apps/sim/lib/workspace-files/application/list-workspace-files.ts @@ -4,7 +4,7 @@ import { MAX_FOLDERS_PER_WORKSPACE } from '@/lib/folders/constants' import { loadActiveFolderPathIndex, resolveFolderPathFilter } from '@/lib/folders/queries' import type { FolderIdScope } from '@/lib/folders/scope' import { resolveFolderScope } from '@/lib/folders/subtree' -import { getWorkspaceShares } from '@/lib/public-shares/share-manager' +import { getWorkspaceShares } from '@/lib/public-shares/manager' import { findListedWorkspaceFiles, listWorkspaceFiles, diff --git a/apps/sim/lib/workspace-files/application/owned-file-content.ts b/apps/sim/lib/workspace-files/application/owned-file-content.ts index 9439336e538..8c2beabadc5 100644 --- a/apps/sim/lib/workspace-files/application/owned-file-content.ts +++ b/apps/sim/lib/workspace-files/application/owned-file-content.ts @@ -1,5 +1,5 @@ import type { DbOrTx } from '@/lib/db/types' -import type { ActiveWorkspaceFileContext } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import type { ActiveWorkspaceFileContext } from '@/lib/uploads/contexts/workspace/file-manager' import { ownedFileKind } from '@/lib/workspace-files/owned-files' /** diff --git a/apps/sim/lib/workspace-files/application/read-stored-workspace-file-record-by-key.ts b/apps/sim/lib/workspace-files/application/read-stored-workspace-file-record-by-key.ts index a28e3966c26..f7a443bc947 100644 --- a/apps/sim/lib/workspace-files/application/read-stored-workspace-file-record-by-key.ts +++ b/apps/sim/lib/workspace-files/application/read-stored-workspace-file-record-by-key.ts @@ -6,7 +6,7 @@ import { } from '@/lib/uploads/contexts/workspace' import { type FileMetadataRecord, getFileMetadataByKey } from '@/lib/uploads/server/metadata' import { isWorkspaceScopedContext } from '@/lib/uploads/shared/types' -import { tryInferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { tryInferContextFromKey } from '@/lib/uploads/utils/file' import { requireAdmittedWorkspaceFile } from '@/lib/workspace-files/application/admit-file-content' import { workspaceFileDelegationPolicy } from '@/lib/workspace-files/application/authorization' import { fileOperations } from '@/lib/workspace-files/application/operations' diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-artifact.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-artifact.test.ts index f6c2f7041fc..41ed4af571b 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-artifact.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-artifact.test.ts @@ -15,7 +15,7 @@ const hoisted = vi.hoisted(() => ({ render: vi.fn(), })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-content-by-key.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-content-by-key.ts index 186a684b023..f7cb38a5c5a 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-content-by-key.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-content-by-key.ts @@ -12,8 +12,8 @@ import { getFileMetadataByKey } from '@/lib/uploads/server/metadata' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { requireAdmittedWorkspaceFile } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { assertOwnedFileAccess } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { assertOwnedFileAccess } from '@/lib/workspace-files/application/workspace-file-context' import { OWNED_FILE_CONTEXTS, ownedFileKind } from '@/lib/workspace-files/owned-files' export interface ReadWorkspaceFileByKeyInput { diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-content.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-content.test.ts index 580b2923f28..1b473f071f8 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-content.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-content.test.ts @@ -18,10 +18,10 @@ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-content.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-content.ts index 2d102681b9c..74438a8df08 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-content.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-content.ts @@ -11,15 +11,15 @@ import { import { getBoundWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_BUFFERED_TRANSFER_BYTES } from '@/lib/uploads/shared/types' import { requireAdmittedWorkspaceFile, workspaceFileProvenanceIdentity, } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ReadWorkspaceFileContentInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.test.ts index 327b495add0..bff2070ea25 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.test.ts @@ -10,8 +10,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' const hoisted = vi.hoisted(() => ({})) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) import { NoWorkspaceAccessError } from '@/lib/core/application' import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata' diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.ts index fdf8fa09419..76ff769ff0c 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-metadata.ts @@ -2,17 +2,17 @@ import type { Principal } from '@sim/auth/principal' import type { ShareRecord } from '@/lib/api/contracts/public-shares' import type { AuthorizedWorkspaceUseCaseContext } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { getShareForResource } from '@/lib/public-shares/share-manager' +import { getShareForResource } from '@/lib/public-shares/manager' import { type ActiveWorkspaceFileContext, getWorkspaceFile, getWorkspaceFileWithCurrentVersion, type VersionedWorkspaceFileRecord, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ReadWorkspaceFileMetadataInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-mount.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-mount.ts index 2bb7530e78d..bc27c42feaa 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-mount.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-mount.ts @@ -9,16 +9,16 @@ import { import { fetchWorkspaceFileBuffer, getWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { isGeneratedDocumentSourceType } from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/contexts/workspace/file-manager' +import { isGeneratedDocumentSourceType } from '@/lib/uploads/utils/file' import { requireAdmittedContributors, requireAdmittedWorkspaceFile, } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' import { fetchAuthorizedServableWorkspaceFileBuffer } from '@/lib/workspace-files/application/fetch-servable-workspace-file-buffer' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ReadWorkspaceFileMountInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-record.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-record.test.ts index 5d988956bc5..d817f77490c 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-record.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-record.test.ts @@ -12,9 +12,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-record.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-record.ts index f665a83c68b..660973a7d48 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-record.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-record.ts @@ -5,11 +5,11 @@ import { type ActiveWorkspaceFileContext, getWorkspaceFile, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { requireAdmittedWorkspaceFile } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ReadWorkspaceFileRecordInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-secret-provenance.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-secret-provenance.ts index 95d1ab4179a..24fc3478765 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-secret-provenance.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-secret-provenance.ts @@ -1,15 +1,15 @@ import type { Principal } from '@sim/auth/principal' import { admitContent } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace/workspace-file-manager' +import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { workspaceFileProvenanceIdentity } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface ReadWorkspaceFileSecretProvenanceInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-text.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-text.test.ts index 54fdf25422e..c6ebd08e078 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-text.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-text.test.ts @@ -354,6 +354,6 @@ describe('readWorkspaceFileText', () => { }) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/lib/workspace-files/application/read-workspace-file-text.ts b/apps/sim/lib/workspace-files/application/read-workspace-file-text.ts index f7fb10bd89f..f5bdf03a108 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-file-text.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-file-text.ts @@ -10,13 +10,13 @@ import { fetchWorkspaceFileBuffer, type WorkspaceFileRecord, } from '@/lib/uploads/contexts/workspace' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { formatFileSize, getFileExtension, MAX_TEXT_EXTRACTION_BYTES, needsRenderedArtifact, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import { requireAdmittedContributors, requireAdmittedWorkspaceFile, diff --git a/apps/sim/lib/workspace-files/application/read-workspace-inline-file.test.ts b/apps/sim/lib/workspace-files/application/read-workspace-inline-file.test.ts index d153b8e868e..59ad41f7c45 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-inline-file.test.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-inline-file.test.ts @@ -13,7 +13,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) vi.mock('@/lib/uploads/core/storage-service', () => storageServiceMock) diff --git a/apps/sim/lib/workspace-files/application/read-workspace-inline-file.ts b/apps/sim/lib/workspace-files/application/read-workspace-inline-file.ts index aa25d8bbaf8..6ab39d205ab 100644 --- a/apps/sim/lib/workspace-files/application/read-workspace-inline-file.ts +++ b/apps/sim/lib/workspace-files/application/read-workspace-inline-file.ts @@ -6,7 +6,7 @@ import { getWorkspaceFile, loadActiveWorkspaceFileContext, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { downloadFileStream } from '@/lib/uploads/core/storage-service' import { getFileMetadataByKey } from '@/lib/uploads/server/metadata' import { requireAdmittedWorkspaceFile } from '@/lib/workspace-files/application/admit-file-content' diff --git a/apps/sim/lib/workspace-files/application/rename-workspace-file.test.ts b/apps/sim/lib/workspace-files/application/rename-workspace-file.test.ts index 62ba0840a35..74f28eda556 100644 --- a/apps/sim/lib/workspace-files/application/rename-workspace-file.test.ts +++ b/apps/sim/lib/workspace-files/application/rename-workspace-file.test.ts @@ -14,7 +14,7 @@ vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { renameWorkspaceFile } from '@/lib/workspace-files/application/rename-workspace-file' diff --git a/apps/sim/lib/workspace-files/application/rename-workspace-file.ts b/apps/sim/lib/workspace-files/application/rename-workspace-file.ts index 72bb001ac39..1f2e8e678f2 100644 --- a/apps/sim/lib/workspace-files/application/rename-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/rename-workspace-file.ts @@ -6,10 +6,10 @@ import { type ActiveWorkspaceFileContext, renameWorkspaceFile as renameStoredWorkspaceFile, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' const logger = createLogger('RenameWorkspaceFile') diff --git a/apps/sim/lib/workspace-files/application/resolve-rendered-workspace-artifact.ts b/apps/sim/lib/workspace-files/application/resolve-rendered-workspace-artifact.ts index 02666bd5b97..89d9ded9ac0 100644 --- a/apps/sim/lib/workspace-files/application/resolve-rendered-workspace-artifact.ts +++ b/apps/sim/lib/workspace-files/application/resolve-rendered-workspace-artifact.ts @@ -1,7 +1,7 @@ import type { Principal } from '@sim/auth/principal' import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace' import { resolveDocumentRender } from '@/lib/uploads/documents' -import type { ServableFile } from '@/lib/uploads/utils/file-utils.server' +import type { ServableFile } from '@/lib/uploads/utils/file.server' import { fetchAuthorizedServableWorkspaceFileBuffer } from '@/lib/workspace-files/application/fetch-servable-workspace-file-buffer' /** diff --git a/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.test.ts b/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.test.ts index 6a1c0e86c63..858079cd310 100644 --- a/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.test.ts +++ b/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.test.ts @@ -8,7 +8,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { defineWorkspaceOperation } from '@/lib/core/application' import { fileOperations } from '@/lib/workspace-files/application/operations' diff --git a/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.ts b/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.ts index a561b4b5c9e..5bcd77cb1e6 100644 --- a/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.ts +++ b/apps/sim/lib/workspace-files/application/resolve-workspace-file-reference.ts @@ -9,10 +9,10 @@ import { resolveWorkspaceFileReference as resolveStoredWorkspaceFileReference, type WorkspaceFileLookupOptions, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { assertOwnedFileAccess } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { assertOwnedFileAccess } from '@/lib/workspace-files/application/workspace-file-context' export interface ResolveWorkspaceFileReferenceInput { principal: Principal diff --git a/apps/sim/lib/workspace-files/application/restore-workspace-file.test.ts b/apps/sim/lib/workspace-files/application/restore-workspace-file.test.ts index 45a36a9ef87..29e53c742f0 100644 --- a/apps/sim/lib/workspace-files/application/restore-workspace-file.test.ts +++ b/apps/sim/lib/workspace-files/application/restore-workspace-file.test.ts @@ -12,7 +12,7 @@ vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) vi.mock('@sim/audit', () => auditMock) vi.mock('@/lib/realtime/notify', () => realtimeNotifyMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { restoreWorkspaceFileOperation } from '@/lib/workspace-files/application/restore-workspace-file' diff --git a/apps/sim/lib/workspace-files/application/restore-workspace-file.ts b/apps/sim/lib/workspace-files/application/restore-workspace-file.ts index d0f0e4f499a..13aa84a6650 100644 --- a/apps/sim/lib/workspace-files/application/restore-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/restore-workspace-file.ts @@ -8,10 +8,10 @@ import { restoreWorkspaceFile, type WorkspaceFileLifecycleContext, type WorkspaceFileRecord, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveWorkspaceFileLifecycleContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveWorkspaceFileLifecycleContext } from '@/lib/workspace-files/application/workspace-file-context' const logger = createLogger('RestoreWorkspaceFile') diff --git a/apps/sim/lib/workspace-files/application/search-workspace-file-content.test.ts b/apps/sim/lib/workspace-files/application/search-workspace-file-content.test.ts index 9ad9935de92..74816113727 100644 --- a/apps/sim/lib/workspace-files/application/search-workspace-file-content.test.ts +++ b/apps/sim/lib/workspace-files/application/search-workspace-file-content.test.ts @@ -23,7 +23,7 @@ vi.mock('@/lib/workspace-files/search/repository', async (importOriginal) => ({ searchFileIndex: hoisted.search, })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/workspace-files/resolve-folder-scope', () => ({ diff --git a/apps/sim/lib/workspace-files/application/search-workspace-file-content.ts b/apps/sim/lib/workspace-files/application/search-workspace-file-content.ts index 83c3cdf52f3..8b29d5bf359 100644 --- a/apps/sim/lib/workspace-files/application/search-workspace-file-content.ts +++ b/apps/sim/lib/workspace-files/application/search-workspace-file-content.ts @@ -7,8 +7,8 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { listFileFolders, loadActiveWorkspaceContext } from '@/lib/uploads/contexts/workspace' import { authorizeWorkspaceFileAccess } from '@/lib/workspace-files/application/authorization' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { assertOwnedFileAccess } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { assertOwnedFileAccess } from '@/lib/workspace-files/application/workspace-file-context' import { resolveWorkspaceFolderScope } from '@/lib/workspace-files/resolve-folder-scope' import { loadFileSearchDelivery, diff --git a/apps/sim/lib/workspace-files/application/share-workspace-file.test.ts b/apps/sim/lib/workspace-files/application/share-workspace-file.test.ts index a6bd7b1da35..cabf72ff180 100644 --- a/apps/sim/lib/workspace-files/application/share-workspace-file.test.ts +++ b/apps/sim/lib/workspace-files/application/share-workspace-file.test.ts @@ -15,14 +15,14 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@/ee/access-control/utils/permission-check', () => permissionCheckMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) const provenance = { diff --git a/apps/sim/lib/workspace-files/application/share-workspace-file.ts b/apps/sim/lib/workspace-files/application/share-workspace-file.ts index d5a708c9f38..b00707f6764 100644 --- a/apps/sim/lib/workspace-files/application/share-workspace-file.ts +++ b/apps/sim/lib/workspace-files/application/share-workspace-file.ts @@ -15,24 +15,24 @@ import { getWorkspaceSharesForResources, ShareValidationError, upsertFileShare, -} from '@/lib/public-shares/share-manager' +} from '@/lib/public-shares/manager' import { findListedWorkspaceFiles, getWorkspaceFile, loadActiveWorkspaceContext, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { getBoundWorkspaceFileSecretProvenanceByIdentity, getCurrentWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { downloadFileStream } from '@/lib/uploads/core/storage-service' import { loadPublishedCompiledDocInputs } from '@/lib/uploads/documents/compiled-store' -import { getFileExtension, isRenderableDocumentName } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, isRenderableDocumentName } from '@/lib/uploads/utils/file' import { workspaceFileProvenanceIdentity } from '@/lib/workspace-files/application/admit-file-content' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' import { MAX_WORKSPACE_FILE_BULK_AFFECTED_ITEMS } from '@/lib/workspace-files/limits' import { validatePublicFileSharing } from '@/ee/access-control/utils/permission-check' diff --git a/apps/sim/lib/workspace-files/application/update-workspace-file-content.test.ts b/apps/sim/lib/workspace-files/application/update-workspace-file-content.test.ts index c2c0e54f5f1..70d400f1e70 100644 --- a/apps/sim/lib/workspace-files/application/update-workspace-file-content.test.ts +++ b/apps/sim/lib/workspace-files/application/update-workspace-file-content.test.ts @@ -12,7 +12,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' /** Both specifiers are mocked: the context resolver imports the manager directly, not the barrel. */ vi.mock('@/lib/uploads/contexts/workspace', () => workspaceUploadsMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/workspace-files/application/update-workspace-file-content.ts b/apps/sim/lib/workspace-files/application/update-workspace-file-content.ts index 1b84b8f1a9e..0af1dbadbd8 100644 --- a/apps/sim/lib/workspace-files/application/update-workspace-file-content.ts +++ b/apps/sim/lib/workspace-files/application/update-workspace-file-content.ts @@ -11,13 +11,13 @@ import { import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { parseWorkspaceFileRevision } from '@/lib/workspace-files/application/file-revision' import { resolveWorkspaceFileVersionWrite } from '@/lib/workspace-files/application/file-version-write' import { fileOperations } from '@/lib/workspace-files/application/operations' import { prepareOwnedFileContentWrite } from '@/lib/workspace-files/application/owned-file-content' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' import { MAX_WORKSPACE_FILE_CONTENT_BYTES } from '@/lib/workspace-files/orchestration' const logger = createLogger('UpdateWorkspaceFileContent') diff --git a/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.test.ts b/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.test.ts index bdcd52b5b3a..efaa3b96510 100644 --- a/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.test.ts +++ b/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.test.ts @@ -7,7 +7,7 @@ import { import { beforeEach, describe, expect, it, vi } from 'vitest' vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { updateWorkspaceFileDimensionsOperation } from '@/lib/workspace-files/application/update-workspace-file-dimensions' diff --git a/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts b/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts index aff7c3d22e1..660a8c197d8 100644 --- a/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts +++ b/apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts @@ -2,10 +2,10 @@ import type { AuthorizedWorkspaceUseCaseContext } from '@/lib/core/application' import { type ActiveWorkspaceFileContext, updateWorkspaceFileDimensions, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { defineAuthorizedWorkspaceFileUseCase } from '@/lib/workspace-files/application/authorized-workspace-file-use-case' +import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/file-context' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceFileContext } from '@/lib/workspace-files/application/workspace-file-context' export interface UpdateWorkspaceFileDimensionsInput { fileId: string diff --git a/apps/sim/lib/workspace-files/application/workspace-operation-context.ts b/apps/sim/lib/workspace-files/application/workspace-operation-context.ts index 6796c9c70ee..29bf3cda1d6 100644 --- a/apps/sim/lib/workspace-files/application/workspace-operation-context.ts +++ b/apps/sim/lib/workspace-files/application/workspace-operation-context.ts @@ -4,7 +4,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { loadWorkspaceFileOperationContext, type WorkspaceFileOperationContext, -} from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +} from '@/lib/uploads/contexts/workspace/file-folder-manager' import { authorizeWorkspaceFileAccess } from '@/lib/workspace-files/application/authorization' export interface AuthorizedWorkspaceOperationContext { diff --git a/apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts b/apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts index 7298e522dfa..529eda610b7 100644 --- a/apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts +++ b/apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts @@ -1,8 +1,8 @@ import { type Principal, resolvePrincipalAttribution } from '@sim/auth/principal' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { ensureWorkspaceFileFolderPath } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' -import { loadActiveWorkspaceContext } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { ensureWorkspaceFileFolderPath } from '@/lib/uploads/contexts/workspace/file-folder-manager' +import { loadActiveWorkspaceContext } from '@/lib/uploads/contexts/workspace/file-manager' +import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { encodeVfsPathSegments, encodeVfsSegment } from '@/lib/vfs/path' import { admitCreateWorkspaceFile, @@ -11,8 +11,8 @@ import { import { fileOperations } from '@/lib/workspace-files/application/operations' import { resolveWorkspaceFileReference } from '@/lib/workspace-files/application/resolve-workspace-file-reference' import { updateWorkspaceFileContentFromBuffer } from '@/lib/workspace-files/application/update-workspace-file-content' +import { parseWorkspaceFileCreatePath } from '@/lib/workspace-files/file-path' import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path' -import { parseWorkspaceFileCreatePath } from '@/lib/workspace-files/workspace-file-path' export interface WriteWorkspaceFileBufferByPathInput { workspaceId: string diff --git a/apps/sim/lib/workspace-files/decode-file-visual.ts b/apps/sim/lib/workspace-files/decode-file-visual.ts index 42741c1bd03..f0005109a73 100644 --- a/apps/sim/lib/workspace-files/decode-file-visual.ts +++ b/apps/sim/lib/workspace-files/decode-file-visual.ts @@ -1,7 +1,7 @@ import { PDFDocument } from 'pdf-lib' import { OrchestrationError } from '@/lib/core/orchestration/types' import type { ArtifactObservation } from '@/lib/mothership/generated/observations' -import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file' import { prepareImageForVision } from '@/lib/workspace-files/prepare-image-for-vision' import { renderDocumentForVision, diff --git a/apps/sim/lib/workspace-files/workspace-file-path.ts b/apps/sim/lib/workspace-files/file-path.ts similarity index 95% rename from apps/sim/lib/workspace-files/workspace-file-path.ts rename to apps/sim/lib/workspace-files/file-path.ts index 9d54cbdc33a..d8586063030 100644 --- a/apps/sim/lib/workspace-files/workspace-file-path.ts +++ b/apps/sim/lib/workspace-files/file-path.ts @@ -1,5 +1,5 @@ import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils' -import { normalizeWorkspaceFileItemName } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { normalizeWorkspaceFileItemName } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { decodeVfsPathSegments } from '@/lib/vfs/path' export function parseWorkspaceFileCreatePath(path: string): { diff --git a/apps/sim/lib/workspace-files/page-document.server.ts b/apps/sim/lib/workspace-files/page-document.server.ts index 7abcdfa74d4..62f457b1dd7 100644 --- a/apps/sim/lib/workspace-files/page-document.server.ts +++ b/apps/sim/lib/workspace-files/page-document.server.ts @@ -1,4 +1,4 @@ -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { downloadFile } from '@/lib/uploads/core/storage-service' import { getFileMetadataById } from '@/lib/uploads/server/metadata' import { renderSimPageDocument } from '@/lib/workspace-files/page-document' diff --git a/apps/sim/lib/workspace-files/queries.test.ts b/apps/sim/lib/workspace-files/queries.test.ts index 7783fa3bacf..1712afc0340 100644 --- a/apps/sim/lib/workspace-files/queries.test.ts +++ b/apps/sim/lib/workspace-files/queries.test.ts @@ -5,8 +5,8 @@ import { } from '@sim/testing/mocks/workspace-file-manager.mock' import { beforeEach, describe, expect, it, vi } from 'vitest' -vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/public-shares/manager', () => publicSharesMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) import { listWorkspaceFilesWithShares } from '@/lib/workspace-files/queries' diff --git a/apps/sim/lib/workspace-files/queries.ts b/apps/sim/lib/workspace-files/queries.ts index ec402dd72e5..bdbef053069 100644 --- a/apps/sim/lib/workspace-files/queries.ts +++ b/apps/sim/lib/workspace-files/queries.ts @@ -1,9 +1,9 @@ import { listWorkspaceFilesContract } from '@/lib/api/contracts/workspace-files' -import { getWorkspaceShares } from '@/lib/public-shares/share-manager' +import { getWorkspaceShares } from '@/lib/public-shares/manager' import { listWorkspaceFiles, type WorkspaceFileScope, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' /** * Lists a workspace's files with each file's public share joined on, parsed through the diff --git a/apps/sim/lib/workspace-files/render-document-for-vision.ts b/apps/sim/lib/workspace-files/render-document-for-vision.ts index 6676686f1b4..716b74deb76 100644 --- a/apps/sim/lib/workspace-files/render-document-for-vision.ts +++ b/apps/sim/lib/workspace-files/render-document-for-vision.ts @@ -3,7 +3,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { CodeLanguage } from '@/lib/execution/languages' import { executeInSandbox } from '@/lib/execution/remote-sandbox' import { MAX_WORKSPACE_FORMDATA_FILE_SIZE } from '@/lib/uploads/shared/types' -import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { resolveEffectiveMimeType } from '@/lib/uploads/utils/file' import { MAX_VISION_OUTPUT_BYTES, readSandboxJpeg } from '@/lib/workspace-files/vision-output' const MAX_PAGES = 20 diff --git a/apps/sim/lib/workspace-files/resolve-folder-scope.ts b/apps/sim/lib/workspace-files/resolve-folder-scope.ts index 53cd8907f55..6e411416130 100644 --- a/apps/sim/lib/workspace-files/resolve-folder-scope.ts +++ b/apps/sim/lib/workspace-files/resolve-folder-scope.ts @@ -1,7 +1,7 @@ import type { Principal } from '@sim/auth/principal' import { OrchestrationError } from '@/lib/core/orchestration/types' import type { FolderIdScope } from '@/lib/folders/scope' -import { listWorkspaceFileFoldersOperation } from '@/lib/workspace-files/application/workspace-file-folders' +import { listWorkspaceFileFoldersOperation } from '@/lib/workspace-files/application/folders' import { toWorkspaceFileFolderPathView } from '@/lib/workspace-files/folder-display-path' import { resolveFolderIdsForPaths } from '@/lib/workspace-files/folder-path-selection' diff --git a/apps/sim/lib/workspace-files/search/delivery.ts b/apps/sim/lib/workspace-files/search/delivery.ts index 8efb27f55b2..306b3e577ee 100644 --- a/apps/sim/lib/workspace-files/search/delivery.ts +++ b/apps/sim/lib/workspace-files/search/delivery.ts @@ -10,7 +10,7 @@ import { getBoundWorkspaceFileSecretProvenanceByMetadata, mergeWorkspaceFileSecretProvenance, type WorkspaceFileSecretProvenance, -} from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +} from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { toWorkspaceFileFolderPathView } from '@/lib/workspace-files/folder-display-path' import { resolveFolderIdsForPaths } from '@/lib/workspace-files/folder-path-selection' import type { EditableFileOwner } from '@/lib/workspace-files/ownership' diff --git a/apps/sim/lib/workspace-files/search/extract.ts b/apps/sim/lib/workspace-files/search/extract.ts index 08238ee876b..ca718372289 100644 --- a/apps/sim/lib/workspace-files/search/extract.ts +++ b/apps/sim/lib/workspace-files/search/extract.ts @@ -4,7 +4,7 @@ import { toError } from '@sim/utils/errors' import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits' import { isSupportedFileType } from '@/lib/file-parsers' import { getFileParserErrorCode } from '@/lib/file-parsers/errors' -import { getFileExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension } from '@/lib/uploads/utils/file' import { FILE_SEARCH_MAX_EXTRACTED_BYTES } from '@/lib/workspace-files/search/constants' import { FileSearchExclusionError } from '@/lib/workspace-files/search/index-plan' import { parseWorkspaceFileText } from '@/lib/workspace-files/text-extraction' diff --git a/apps/sim/lib/workspace-files/search/owners.integration.ts b/apps/sim/lib/workspace-files/search/owners.integration.ts index 08f5cbb5b9c..28d75957e74 100644 --- a/apps/sim/lib/workspace-files/search/owners.integration.ts +++ b/apps/sim/lib/workspace-files/search/owners.integration.ts @@ -41,11 +41,11 @@ vi.mock('@/lib/core/config/env-flags', () => envFlagsMock) import { getFileContentProvenance } from '@/lib/internal/file/operations' import { lockProject } from '@/lib/projects/membership' -import { listFileFolders } from '@/lib/uploads/contexts/workspace/workspace-file-folder-manager' +import { listFileFolders } from '@/lib/uploads/contexts/workspace/file-folder-manager' import { createOwnedWorkspaceFile, uploadWorkspaceFile, -} from '@/lib/uploads/contexts/workspace/workspace-file-manager' +} from '@/lib/uploads/contexts/workspace/file-manager' import { compiledArtifactKey, storeCompiledDoc } from '@/lib/uploads/documents/compiled-store' import { fileDocumentInputIdentity } from '@/lib/uploads/documents/input-identity' import { fetchAuthorizedServableWorkspaceFileBuffer } from '@/lib/workspace-files/application/fetch-servable-workspace-file-buffer' diff --git a/apps/sim/lib/workspace-files/search/repository.ts b/apps/sim/lib/workspace-files/search/repository.ts index 74a7c2d49c0..b698129350f 100644 --- a/apps/sim/lib/workspace-files/search/repository.ts +++ b/apps/sim/lib/workspace-files/search/repository.ts @@ -4,7 +4,7 @@ import { getPostgresErrorCode } from '@sim/utils/errors' import { and, eq, inArray, isNull, type SQLWrapper, sql } from 'drizzle-orm' import type { DbTransaction } from '@/lib/db/types' import type { FolderIdScope } from '@/lib/folders/scope' -import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import type { WorkspaceFileSecretProvenanceIdentity } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import type { EditableFileOwner } from '@/lib/workspace-files/ownership' import { workspaceFileFolderScopeCondition } from '@/lib/workspace-files/query-scope' import { fileSearchAdmission } from '@/lib/workspace-files/search/admission' diff --git a/apps/sim/lib/workspace-files/text-format.ts b/apps/sim/lib/workspace-files/text-format.ts index 6fe58aa23ef..0ef55ec94af 100644 --- a/apps/sim/lib/workspace-files/text-format.ts +++ b/apps/sim/lib/workspace-files/text-format.ts @@ -1,5 +1,5 @@ import { isSupportedFileType } from '@/lib/file-parsers' -import { getFileExtension, resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, resolveEffectiveMimeType } from '@/lib/uploads/utils/file' /** Agent reads reuse the parser registry, including plain source files identified by MIME. */ export function workspaceFileTextFormat(file: { name: string; type: string }) { diff --git a/apps/sim/lib/workspaces/application/workspace-context.test.ts b/apps/sim/lib/workspaces/application/context.test.ts similarity index 96% rename from apps/sim/lib/workspaces/application/workspace-context.test.ts rename to apps/sim/lib/workspaces/application/context.test.ts index 9ef7bb01c38..7ba8b160be7 100644 --- a/apps/sim/lib/workspaces/application/workspace-context.test.ts +++ b/apps/sim/lib/workspaces/application/context.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it } from 'vitest' import { loadActiveWorkspaceApplicationContext, resolveActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' describe('loadActiveWorkspaceApplicationContext', () => { beforeEach(() => { diff --git a/apps/sim/lib/workspaces/application/workspace-context.ts b/apps/sim/lib/workspaces/application/context.ts similarity index 100% rename from apps/sim/lib/workspaces/application/workspace-context.ts rename to apps/sim/lib/workspaces/application/context.ts diff --git a/apps/sim/lib/workspaces/application/get-public-workspace.ts b/apps/sim/lib/workspaces/application/get-public-workspace.ts index 1dab39b9b5d..6677bd3a6db 100644 --- a/apps/sim/lib/workspaces/application/get-public-workspace.ts +++ b/apps/sim/lib/workspaces/application/get-public-workspace.ts @@ -1,7 +1,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { workspaceOperations } from '@/lib/workspaces/application/operations' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' import { getPublicWorkspaceDetail, type PublicWorkspaceDetail, diff --git a/apps/sim/lib/workspaces/application/inbox-settings.test.ts b/apps/sim/lib/workspaces/application/inbox-settings.test.ts index acd5ea7fa8d..38fae3df976 100644 --- a/apps/sim/lib/workspaces/application/inbox-settings.test.ts +++ b/apps/sim/lib/workspaces/application/inbox-settings.test.ts @@ -23,7 +23,7 @@ vi.mock('@/lib/permission-groups/capability-assertions', async (importOriginal) ...(await importOriginal()), assertWorkspaceCapability: hoisted.capability, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/billing/core/subscription', () => billingSubscriptionMock) vi.mock('@/lib/mothership/inbox/lifecycle', () => ({ enableInbox: hoisted.enable, diff --git a/apps/sim/lib/workspaces/application/inbox-settings.ts b/apps/sim/lib/workspaces/application/inbox-settings.ts index ff120a4c4f3..c81c840466e 100644 --- a/apps/sim/lib/workspaces/application/inbox-settings.ts +++ b/apps/sim/lib/workspaces/application/inbox-settings.ts @@ -9,7 +9,7 @@ import { readInboxSettingsRecord, updateInboxSettingsRecord, } from '@/lib/mothership/inbox/settings-store' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' export const inboxSettingsOperations = { read: defineWorkspaceOperation({ diff --git a/apps/sim/lib/workspaces/application/list-public-workspace-members.ts b/apps/sim/lib/workspaces/application/list-public-workspace-members.ts index 02bd26a0602..bb5189f16ff 100644 --- a/apps/sim/lib/workspaces/application/list-public-workspace-members.ts +++ b/apps/sim/lib/workspaces/application/list-public-workspace-members.ts @@ -1,7 +1,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { OrchestrationError } from '@/lib/core/orchestration/types' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { workspaceOperations } from '@/lib/workspaces/application/operations' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' import { queryPublicWorkspaceMembers, type WorkspaceMemberPage, diff --git a/apps/sim/lib/workspaces/application/list-public-workspaces.test.ts b/apps/sim/lib/workspaces/application/list-public-workspaces.test.ts index c84c19c34be..3853c2c5f3d 100644 --- a/apps/sim/lib/workspaces/application/list-public-workspaces.test.ts +++ b/apps/sim/lib/workspaces/application/list-public-workspaces.test.ts @@ -26,7 +26,7 @@ vi.mock('@/lib/workspaces/public-queries', () => ({ getPublicWorkspaceDetail: hoisted.getDetail, getPublicWorkspaceDetails: hoisted.getDetails, })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/permission-groups/config-scope.server', () => permissionGroupScopeMock) import { DEFAULT_PERMISSION_GROUP_CONFIG } from '@/lib/permission-groups/fields' diff --git a/apps/sim/lib/workspaces/application/list-public-workspaces.ts b/apps/sim/lib/workspaces/application/list-public-workspaces.ts index 23635bf0256..061446f4d22 100644 --- a/apps/sim/lib/workspaces/application/list-public-workspaces.ts +++ b/apps/sim/lib/workspaces/application/list-public-workspaces.ts @@ -8,8 +8,8 @@ import { import { OrchestrationError } from '@/lib/core/orchestration/types' import { mapWithConcurrency } from '@/lib/core/utils/concurrency' import { isWorkspaceCapabilityWithheld } from '@/lib/permission-groups/capability-assertions' +import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { workspaceOperations } from '@/lib/workspaces/application/operations' -import { loadActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' import { getPublicWorkspaceDetail, getPublicWorkspaceDetails, diff --git a/apps/sim/lib/workspaces/application/list-recently-deleted.ts b/apps/sim/lib/workspaces/application/list-recently-deleted.ts index c93fef5698a..1621409a3e8 100644 --- a/apps/sim/lib/workspaces/application/list-recently-deleted.ts +++ b/apps/sim/lib/workspaces/application/list-recently-deleted.ts @@ -16,7 +16,7 @@ import type { StaticPermissionGroupCapability } from '@/lib/permission-groups/ca import { isWorkspaceCapabilityWithheld } from '@/lib/permission-groups/capability-assertions' import { tableOperations } from '@/lib/table/application/operations' import { fileOperations } from '@/lib/workspace-files/application/operations' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { listRecentlyDeletedItems } from '@/lib/workspaces/recently-deleted' type RecentlyDeletedType = RecentlyDeletedItem['type'] diff --git a/apps/sim/lib/workspaces/application/manage-permissions.test.ts b/apps/sim/lib/workspaces/application/manage-permissions.test.ts index 240fc8d01f8..8af2a28ecbd 100644 --- a/apps/sim/lib/workspaces/application/manage-permissions.test.ts +++ b/apps/sim/lib/workspaces/application/manage-permissions.test.ts @@ -19,7 +19,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) vi.mock('@/lib/workspaces/permissions/management-store', async (importOriginal) => ({ ...(await importOriginal()), @@ -30,7 +30,7 @@ vi.mock('@/lib/workspaces/permissions/management-store', async (importOriginal) import { COPILOT_APPLICATION_SYSTEM_ERROR_MESSAGE, messageForCopilotApplicationError, -} from '@/lib/mothership/application/error' +} from '@/lib/mothership/application/errors' import { updateWorkspacePermissions } from '@/lib/workspaces/application/manage-permissions' import { WorkspacePermissionError } from '@/lib/workspaces/permissions/management-store' diff --git a/apps/sim/lib/workspaces/application/manage-permissions.ts b/apps/sim/lib/workspaces/application/manage-permissions.ts index 6ba6c84e6e7..57507c2710e 100644 --- a/apps/sim/lib/workspaces/application/manage-permissions.ts +++ b/apps/sim/lib/workspaces/application/manage-permissions.ts @@ -4,7 +4,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { defineWorkspaceOperation } from '@/lib/core/application/workspace-operation' import { OrchestrationError } from '@/lib/core/orchestration/types' import { HttpError } from '@/lib/core/utils/http-error' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { type WorkspacePermissionUpdate, workspacePermissionUpdatesSchema, diff --git a/apps/sim/lib/workspaces/application/public-workspace-reads.test.ts b/apps/sim/lib/workspaces/application/public-workspace-reads.test.ts index 35699b3db47..52a52425549 100644 --- a/apps/sim/lib/workspaces/application/public-workspace-reads.test.ts +++ b/apps/sim/lib/workspaces/application/public-workspace-reads.test.ts @@ -15,7 +15,7 @@ const hoisted = vi.hoisted(() => ({ listMembers: vi.fn(), })) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) diff --git a/apps/sim/lib/workspaces/application/record-workspace-visit.test.ts b/apps/sim/lib/workspaces/application/record-workspace-visit.test.ts index 53ef79ab5e8..e0371b89e37 100644 --- a/apps/sim/lib/workspaces/application/record-workspace-visit.test.ts +++ b/apps/sim/lib/workspaces/application/record-workspace-visit.test.ts @@ -10,7 +10,7 @@ const mocks = vi.hoisted(() => ({ record: vi.fn(), })) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workspaces/visits', () => ({ recordWorkspaceVisitRecord: mocks.record })) import { NoWorkspaceAccessError } from '@/lib/core/application' diff --git a/apps/sim/lib/workspaces/application/record-workspace-visit.ts b/apps/sim/lib/workspaces/application/record-workspace-visit.ts index 89de9a103f7..c324d269f01 100644 --- a/apps/sim/lib/workspaces/application/record-workspace-visit.ts +++ b/apps/sim/lib/workspaces/application/record-workspace-visit.ts @@ -1,6 +1,6 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application' import { defineWorkspaceOperation } from '@/lib/core/application/workspace-operation' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { recordWorkspaceVisitRecord } from '@/lib/workspaces/visits' export const workspaceVisitOperations = { diff --git a/apps/sim/lib/workspaces/application/remove-member.test.ts b/apps/sim/lib/workspaces/application/remove-member.test.ts index e79a7496af2..270592d1c5b 100644 --- a/apps/sim/lib/workspaces/application/remove-member.test.ts +++ b/apps/sim/lib/workspaces/application/remove-member.test.ts @@ -32,7 +32,7 @@ const hoisted = vi.hoisted(() => ({ })) vi.mock('@sim/audit', () => auditMock) vi.mock('@sim/platform-authz/workspace', () => workspaceAuthzMock) -vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) +vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) vi.mock('@/lib/workspaces/access/workspace-access', () => ({ revokeWorkspaceAccessTx: hoisted.revoke, diff --git a/apps/sim/lib/workspaces/application/remove-member.ts b/apps/sim/lib/workspaces/application/remove-member.ts index 6b1fb7990de..9fc09180883 100644 --- a/apps/sim/lib/workspaces/application/remove-member.ts +++ b/apps/sim/lib/workspaces/application/remove-member.ts @@ -3,7 +3,7 @@ import { requirePrincipalSubjectUserId } from '@sim/auth/principal' import { defineAuthorizedWorkspaceUseCase, requireCurrentHumanRole } from '@/lib/core/application' import { defineWorkspaceOperation } from '@/lib/core/application/workspace-operation' import { OrchestrationError } from '@/lib/core/orchestration/types' -import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/workspace-context' +import { resolveActiveWorkspaceApplicationContext } from '@/lib/workspaces/application/context' import { removeWorkspaceMemberRecord } from '@/lib/workspaces/permissions/member-removal-store' /** permission-group-exempt: members may leave; workspace administrators may remove existing collaborators. */ diff --git a/apps/sim/lib/workspaces/operations/application.ts b/apps/sim/lib/workspaces/operations/application.ts index a3ef963cab7..d88268c408c 100644 --- a/apps/sim/lib/workspaces/operations/application.ts +++ b/apps/sim/lib/workspaces/operations/application.ts @@ -7,7 +7,7 @@ import { OrchestrationError } from '@/lib/core/orchestration/types' import { type ActiveWorkspaceApplicationContext, resolveActiveWorkspaceApplicationContext, -} from '@/lib/workspaces/application/workspace-context' +} from '@/lib/workspaces/application/context' import { workspaceOperations } from '@/lib/workspaces/operations/operations' import type { WorkspaceOperationReport } from '@/lib/workspaces/operations/receipts' import { refreshWorkspaceOperation } from '@/lib/workspaces/operations/refresh' diff --git a/apps/sim/providers/attachments.ts b/apps/sim/providers/attachments.ts index 0f60300f838..e24ba48893f 100644 --- a/apps/sim/providers/attachments.ts +++ b/apps/sim/providers/attachments.ts @@ -10,7 +10,7 @@ import { MIME_TYPE_MAPPING, MODEL_SUPPORTED_IMAGE_MIME_TYPES, resolveFileType, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import { getNativeConversationMessage, diff --git a/apps/sim/providers/file-attachments-authorization.test.ts b/apps/sim/providers/file-attachments-authorization.test.ts index 86adbd5897a..c05b2c5da9a 100644 --- a/apps/sim/providers/file-attachments-authorization.test.ts +++ b/apps/sim/providers/file-attachments-authorization.test.ts @@ -14,11 +14,11 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import type { ExecutionContext, UserFile } from '@/executor/types' vi.mock('@/lib/uploads', () => uploadsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/uploads/server/metadata', () => uploadsMetadataMock) vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock) -import { resolveTrustedFileContext } from '@/lib/uploads/utils/file-utils' +import { resolveTrustedFileContext } from '@/lib/uploads/utils/file' import { attachLargeFileRemoteUrls, uploadLargeFilesToProvider, diff --git a/apps/sim/providers/file-attachments.server.test.ts b/apps/sim/providers/file-attachments.server.test.ts index 5df748bf172..9834ff06acc 100644 --- a/apps/sim/providers/file-attachments.server.test.ts +++ b/apps/sim/providers/file-attachments.server.test.ts @@ -59,7 +59,7 @@ vi.mock('@google/genai', () => ({ vi.mock('@/lib/uploads', () => uploadsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) diff --git a/apps/sim/providers/file-attachments.server.ts b/apps/sim/providers/file-attachments.server.ts index 5475c2ee3df..1f44fd00cd5 100644 --- a/apps/sim/providers/file-attachments.server.ts +++ b/apps/sim/providers/file-attachments.server.ts @@ -5,8 +5,8 @@ import { sleep } from '@sim/utils/helpers' import { assertUserFileContentAccess } from '@/lib/execution/payloads/materialization.server' import { resolveExecutorFileMaterializationContext } from '@/lib/internal/file/materialization-context' import { StorageService } from '@/lib/uploads' -import { resolveTrustedFileContext } from '@/lib/uploads/utils/file-utils' -import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file-utils.server' +import { resolveTrustedFileContext } from '@/lib/uploads/utils/file' +import { downloadServableFileFromStorage } from '@/lib/uploads/utils/file.server' import { verifyFileAccess } from '@/app/api/files/authorization' import type { ExecutionContext, UserFile } from '@/executor/types' import { diff --git a/apps/sim/providers/index.test.ts b/apps/sim/providers/index.test.ts index 736e13915de..a7c7c9a347f 100644 --- a/apps/sim/providers/index.test.ts +++ b/apps/sim/providers/index.test.ts @@ -29,7 +29,7 @@ vi.mock('@/providers/file-attachments.server', () => ({ })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) diff --git a/apps/sim/providers/index.ts b/apps/sim/providers/index.ts index ad5a6b90a2d..c9935750d5b 100644 --- a/apps/sim/providers/index.ts +++ b/apps/sim/providers/index.ts @@ -3,7 +3,7 @@ import { toError } from '@sim/utils/errors' import { getApiKeyWithBYOK } from '@/lib/api-key/byok' import { env, envNumber } from '@/lib/core/config/env' import type { ConversationUsageTotal } from '@/lib/memory/conversation-types' -import { filterModelSafeWorkspaceFileAttachments } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { filterModelSafeWorkspaceFileAttachments } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { appendUnavailableAttachmentNotice } from '@/lib/uploads/utils/model-input' import type { StreamingExecution } from '@/executor/types' import { diff --git a/apps/sim/providers/tool-binding.ts b/apps/sim/providers/tool-binding.ts index 511278b7e9d..d0783592cb7 100644 --- a/apps/sim/providers/tool-binding.ts +++ b/apps/sim/providers/tool-binding.ts @@ -52,7 +52,7 @@ export const BINDABLE_SUBBLOCK_KINDS: Partial { /** * Returns what the tool actually receives. The executor merges the mapper's * output OVER the raw inputs (`finalInputs = { ...inputs, ...transformedParams }` - * in `executor/handlers/generic/generic-handler.ts`), so a key the mapper merely + * in `executor/handlers/generic/handler.ts`), so a key the mapper merely * omits survives as its raw subBlock string. Asserting on the mapper's return * alone would let an alias or a stale filter through unnoticed. */ diff --git a/apps/sim/tools/extend/parser.ts b/apps/sim/tools/extend/parser.ts index 605ed04d288..68a5cc4d9f5 100644 --- a/apps/sim/tools/extend/parser.ts +++ b/apps/sim/tools/extend/parser.ts @@ -1,5 +1,5 @@ import { toError } from '@sim/utils/errors' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' import type { ExtendParserInput, ExtendParserOutput, diff --git a/apps/sim/tools/extend/types.ts b/apps/sim/tools/extend/types.ts index b559e1d9055..0394850ee4c 100644 --- a/apps/sim/tools/extend/types.ts +++ b/apps/sim/tools/extend/types.ts @@ -1,4 +1,4 @@ -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { ToolResponse } from '@/tools/types' diff --git a/apps/sim/tools/file-message-operation-security.test.ts b/apps/sim/tools/file-message-operation-security.test.ts index 7b2bdad1cbf..bfaf12ae63b 100644 --- a/apps/sim/tools/file-message-operation-security.test.ts +++ b/apps/sim/tools/file-message-operation-security.test.ts @@ -26,13 +26,13 @@ const mocks = vi.hoisted(() => ({ })) vi.mock('@/app/api/files/authorization', () => filesAuthorizationMock) -vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) -vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) +vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) +vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) vi.mock('@/lib/execution/model-input-provenance', () => ({ validateOpaqueModelInputProvenance: mocks.validateOpaqueModelInputProvenance, })) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) vi.mock('@/lib/internal/clickup/client', () => ({ diff --git a/apps/sim/tools/file/parser.ts b/apps/sim/tools/file/parser.ts index 743b4b388bb..8ea34bbf5d2 100644 --- a/apps/sim/tools/file/parser.ts +++ b/apps/sim/tools/file/parser.ts @@ -1,6 +1,6 @@ import { createLogger } from '@sim/logger' import { isRecordLike, toRecord } from '@sim/utils/object' -import { inferContextFromKey } from '@/lib/uploads/utils/file-utils' +import { inferContextFromKey } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { FileFetchInput, diff --git a/apps/sim/tools/function/execute.ts b/apps/sim/tools/function/execute.ts index 9d16ffcc854..2e3e8517beb 100644 --- a/apps/sim/tools/function/execute.ts +++ b/apps/sim/tools/function/execute.ts @@ -9,7 +9,7 @@ import { isUserFileWithMetadata } from '@/lib/core/utils/user-file' import { DEFAULT_EXECUTION_TIMEOUT_MS } from '@/lib/execution/constants' import { DEFAULT_CODE_LANGUAGE } from '@/lib/execution/languages' import { PRIVATE_SECRET_PROVENANCE_FIELD } from '@/lib/execution/private-tool-metadata' -import { SANDBOX_INPUT_DIR, SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/sandbox-paths' +import { SANDBOX_INPUT_DIR, SANDBOX_OUTPUT_DIR } from '@/lib/execution/remote-sandbox/paths' import { MAX_FUNCTION_CODE_LENGTH } from '@/lib/function-execution/limits' import type { UserFile } from '@/executor/types' import type { CodeExecutionInput, CodeExecutionOutput } from '@/tools/function/types' diff --git a/apps/sim/tools/github/branch_protection_and_workflow_runs.test.ts b/apps/sim/tools/github/branch_protection_and_workflow_runs.test.ts index 7d2a4472f41..0c5947502c0 100644 --- a/apps/sim/tools/github/branch_protection_and_workflow_runs.test.ts +++ b/apps/sim/tools/github/branch_protection_and_workflow_runs.test.ts @@ -209,7 +209,7 @@ describe('github block wiring', () => { }) /** - * `generic-handler.ts` merges `{ ...inputs, ...params(inputs) }` and + * `generic/handler.ts` merges `{ ...inputs, ...params(inputs) }` and * `providers/utils.ts` installs this same function as the provider * `paramsTransform`, spreading it over the model's tool-call arguments. Emitting * a key the block did not supply would overwrite a model-supplied value with diff --git a/apps/sim/tools/github/get_file_content.ts b/apps/sim/tools/github/get_file_content.ts index cdc12c09b58..102a1ec3a61 100644 --- a/apps/sim/tools/github/get_file_content.ts +++ b/apps/sim/tools/github/get_file_content.ts @@ -1,5 +1,5 @@ import { truncate } from '@sim/utils/string' -import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils' +import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file' import type { FileContentResponse, GetFileContentParams } from '@/tools/github/types' import type { ToolConfig } from '@/tools/types' diff --git a/apps/sim/tools/index.test.ts b/apps/sim/tools/index.test.ts index a7fa6963d99..63494d50337 100644 --- a/apps/sim/tools/index.test.ts +++ b/apps/sim/tools/index.test.ts @@ -57,7 +57,7 @@ import { } from '@sim/testing' import { DrizzleQueryError } from 'drizzle-orm/errors' import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution' +import type { BillingAttributionSnapshot } from '@/lib/billing/core/attribution' import type { EnvironmentResolutionSnapshot } from '@/lib/environment/utils' import { executeBitbucketTool } from '@/lib/internal/bitbucket/execute-tool' import { createInternalToolFileResult } from '@/lib/internal/tool-operations/file-result' @@ -165,10 +165,10 @@ vi.mock('@/lib/core/rate-limiter/hosted-key', () => ({ getHostedKeyRateLimiter: () => mockRateLimiterFns, })) -vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) +vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) vi.mock( - '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + '@/lib/uploads/contexts/workspace/file-secret-provenance', () => workspaceFileSecretProvenanceMock ) @@ -181,7 +181,7 @@ vi.mock('@/executor/utils/credential-token', () => ({ mockResolveExecutorCredentialToken(...args), })) -vi.mock('@/executor/handlers/workflow/workflow-tool-runner', () => ({ +vi.mock('@/executor/handlers/workflow/tool-runner', () => ({ runWorkflowTool: (...args: unknown[]) => mockRunWorkflowTool(...args), })) @@ -423,7 +423,7 @@ vi.mock('@/tools/utils.server', async (importOriginal) => { import type { QueryClient } from '@tanstack/react-query' import { adoptToolFailure, classifyFailure, logFailureOnce } from '@/lib/core/errors/failure-log' import * as getQueryClientModule from '@/app/_shell/providers/get-query-client' -import { ApiBlockHandler } from '@/executor/handlers/api/api-handler' +import { ApiBlockHandler } from '@/executor/handlers/api/handler' import { buildBlockExecutionError } from '@/executor/utils/errors' import type { SerializedBlock } from '@/serializer/types' import { executeTool, postProcessToolOutput } from '@/tools' diff --git a/apps/sim/tools/index.ts b/apps/sim/tools/index.ts index 32360f8e6cd..eec0f06a4db 100644 --- a/apps/sim/tools/index.ts +++ b/apps/sim/tools/index.ts @@ -14,7 +14,7 @@ import { BILLING_ATTRIBUTION_HEADER, type BillingAttributionSnapshot, serializeBillingAttributionHeader, -} from '@/lib/billing/core/billing-attribution' +} from '@/lib/billing/core/attribution' import { isHosted } from '@/lib/core/config/env-flags' import { findDatabaseQueryError } from '@/lib/core/errors/database-query-error' import { @@ -50,7 +50,7 @@ import { SIM_VIA_HEADER, serializeCallChain } from '@/lib/execution/call-chain' import { INTERNAL_EXECUTION_DEADLINE_HEADER, serializeExecutionDeadlineHeader, -} from '@/lib/execution/execution-deadline-header' +} from '@/lib/execution/deadline-header' import { addModelInputProvenanceToRequest, createModelInputProvenanceRequestMetadata, @@ -93,8 +93,8 @@ import { } from '@/lib/mothership/billing/service-observer' import { CredentialRevokedError } from '@/lib/oauth/credential-revoked' import type { CredentialTokenPayload } from '@/lib/oauth/token-resolution' -import { resolveWorkspaceFileReference } from '@/lib/uploads/contexts/workspace/workspace-file-manager' -import { markWorkspaceFileSecretProvenanceUnknown } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance' +import { resolveWorkspaceFileReference } from '@/lib/uploads/contexts/workspace/file-manager' +import { markWorkspaceFileSecretProvenanceUnknown } from '@/lib/uploads/contexts/workspace/file-secret-provenance' import { MAX_FILE_SIZE } from '@/lib/uploads/utils/validation' import { assertPermissionsAllowed } from '@/ee/access-control/utils/permission-check' import { isCustomTool, isMcpTool } from '@/executor/constants' @@ -2063,7 +2063,7 @@ async function executeToolImplementation( // the canvas workflow block. if (normalizedToolId === 'workflow_executor') { logger.info(`[${requestId}] Running workflow tool ${toolId} in-process`) - const { runWorkflowTool } = await import('@/executor/handlers/workflow/workflow-tool-runner') + const { runWorkflowTool } = await import('@/executor/handlers/workflow/tool-runner') const result = await runWorkflowTool( { ...contextParams, diff --git a/apps/sim/tools/knowledge/types.ts b/apps/sim/tools/knowledge/types.ts index a08d99dff58..b5792b74ad2 100644 --- a/apps/sim/tools/knowledge/types.ts +++ b/apps/sim/tools/knowledge/types.ts @@ -1,7 +1,7 @@ import { getFileExtension, getMimeTypeFromExtension as getUploadMimeType, -} from '@/lib/uploads/utils/file-utils' +} from '@/lib/uploads/utils/file' const TEXT_COMPATIBLE_MIME_TYPES = new Set([ 'text/plain', diff --git a/apps/sim/tools/mistral/parser.ts b/apps/sim/tools/mistral/parser.ts index 9c69f29777b..074e4542d1a 100644 --- a/apps/sim/tools/mistral/parser.ts +++ b/apps/sim/tools/mistral/parser.ts @@ -1,7 +1,7 @@ import { createLogger } from '@sim/logger' import { toError } from '@sim/utils/errors' import { generateRandomString } from '@sim/utils/random' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' import { selectModelBoundFileInputPaths, selectPreferredModelBoundFileInputPaths, diff --git a/apps/sim/tools/mistral/types.ts b/apps/sim/tools/mistral/types.ts index 5928adaffb4..83e3a1e8ba7 100644 --- a/apps/sim/tools/mistral/types.ts +++ b/apps/sim/tools/mistral/types.ts @@ -1,4 +1,4 @@ -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { OutputProperty, ToolResponse } from '@/tools/types' diff --git a/apps/sim/tools/okta/tools.test.ts b/apps/sim/tools/okta/tools.test.ts index 81f633505e8..382ee61493d 100644 --- a/apps/sim/tools/okta/tools.test.ts +++ b/apps/sim/tools/okta/tools.test.ts @@ -35,7 +35,7 @@ function builtBody(build: () => unknown): Record { } /** - * Mirrors `generic-handler.ts`, which spreads the mapper's result over the raw + * Mirrors `generic/handler.ts`, which spreads the mapper's result over the raw * serialized inputs. A key the mapper omits keeps its raw subBlock value, so a * guard is only real if it survives this merge. */ diff --git a/apps/sim/tools/planetscale/listing.ts b/apps/sim/tools/planetscale/listing.ts index 44863cca856..ae469476595 100644 --- a/apps/sim/tools/planetscale/listing.ts +++ b/apps/sim/tools/planetscale/listing.ts @@ -3,7 +3,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { fetchProviderJsonWithStatus } from '@/lib/selectors/server/providers/provider-http' +import { fetchProviderJsonWithStatus } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, listSelectorResult } from '@/lib/selectors/server/types' import type { SafeSelectorOption, SelectorRequest } from '@/lib/selectors/types' import type { PlanetScaleScope } from '@/tools/planetscale/types' diff --git a/apps/sim/tools/powerbi/listing.ts b/apps/sim/tools/powerbi/listing.ts index 8f80646a2b2..8f6d8d28af7 100644 --- a/apps/sim/tools/powerbi/listing.ts +++ b/apps/sim/tools/powerbi/listing.ts @@ -3,7 +3,7 @@ import { SelectorContextUnavailableError, SelectorOptionsUnavailableError, } from '@/lib/selectors/server/errors' -import { selectorProviderStatusError } from '@/lib/selectors/server/providers/provider-http' +import { selectorProviderStatusError } from '@/lib/selectors/server/providers/http' import { detailSelectorResult, listSelectorResult, diff --git a/apps/sim/tools/pulse/parser.ts b/apps/sim/tools/pulse/parser.ts index d4d893adf1f..5dc5e6786f0 100644 --- a/apps/sim/tools/pulse/parser.ts +++ b/apps/sim/tools/pulse/parser.ts @@ -1,5 +1,5 @@ import { toError } from '@sim/utils/errors' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' import type { PulseParserInput, PulseParserOutput, PulseParserV2Input } from '@/tools/pulse/types' import type { InternalToolConfig } from '@/tools/types' diff --git a/apps/sim/tools/pulse/types.ts b/apps/sim/tools/pulse/types.ts index fb51dcfe62d..54dd69d58fb 100644 --- a/apps/sim/tools/pulse/types.ts +++ b/apps/sim/tools/pulse/types.ts @@ -1,4 +1,4 @@ -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { ToolResponse } from '@/tools/types' diff --git a/apps/sim/tools/reducto/parser.ts b/apps/sim/tools/reducto/parser.ts index a5e3ac98b94..70b8d413291 100644 --- a/apps/sim/tools/reducto/parser.ts +++ b/apps/sim/tools/reducto/parser.ts @@ -1,5 +1,5 @@ import { toError } from '@sim/utils/errors' -import { isInternalFileUrl } from '@/lib/uploads/utils/file-utils' +import { isInternalFileUrl } from '@/lib/uploads/utils/file' import type { ReductoParserInput, ReductoParserOutput, diff --git a/apps/sim/tools/reducto/types.ts b/apps/sim/tools/reducto/types.ts index 81e46516813..67ac22c58c7 100644 --- a/apps/sim/tools/reducto/types.ts +++ b/apps/sim/tools/reducto/types.ts @@ -1,4 +1,4 @@ -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { ToolResponse } from '@/tools/types' diff --git a/apps/sim/tools/textract/types.ts b/apps/sim/tools/textract/types.ts index cbe603c6883..e8f8c322625 100644 --- a/apps/sim/tools/textract/types.ts +++ b/apps/sim/tools/textract/types.ts @@ -1,4 +1,4 @@ -import type { RawFileInput } from '@/lib/uploads/utils/file-utils' +import type { RawFileInput } from '@/lib/uploads/utils/file' import type { UserFile } from '@/executor/types' import type { ToolResponse } from '@/tools/types' diff --git a/apps/sim/tools/zoho_desk/list_tickets.test.ts b/apps/sim/tools/zoho_desk/list_tickets.test.ts index a1c6ca6d8a3..4625b0257bd 100644 --- a/apps/sim/tools/zoho_desk/list_tickets.test.ts +++ b/apps/sim/tools/zoho_desk/list_tickets.test.ts @@ -52,7 +52,7 @@ describe('zohoDeskListTicketsTool request url', () => { /** * Models the real block-to-tool seam. The executor merges the mapper's output * ON TOP of the serialized inputs (`{ ...inputs, ...transformedParams }` in - * executor/handlers/generic/generic-handler.ts), so the mapper can overwrite a + * executor/handlers/generic/handler.ts), so the mapper can overwrite a * key but never remove one. A test that passes only the mapper's return value * would miss every stale input the merge restores — which is precisely the * class of bug these cover. diff --git a/knip.jsonc b/knip.jsonc index 520efe9488d..15437fda438 100644 --- a/knip.jsonc +++ b/knip.jsonc @@ -48,7 +48,7 @@ // Generated contracts mirror their source of truth; regenerating them must not // trip the unused-export ratchet, and hand edits would be overwritten. "lib/mothership/generated/**": ["exports", "types", "duplicates"], - "sandbox-tasks/index.ts": ["files"], + "sandboxes/index.ts": ["files"], "components/mcp/index.ts": ["files"], "triggers/quickbooks/index.ts": ["files"], "lib/api/contracts/selectors/index.ts": ["files"], diff --git a/packages/testing/src/mocks/auth-client.mock.ts b/packages/testing/src/mocks/auth-client.mock.ts index a01b6159457..d0859f7952f 100644 --- a/packages/testing/src/mocks/auth-client.mock.ts +++ b/packages/testing/src/mocks/auth-client.mock.ts @@ -5,7 +5,7 @@ const mockRefetchSession = vi.fn(async (): Promise => {}) const mockSignOut = vi.fn() /** - * Stand-in for the Better Auth `client` from `@/lib/auth/auth-client`: every endpoint the app + * Stand-in for the Better Auth `client` from `@/lib/auth/client`: every endpoint the app * calls is a bare `vi.fn()` (resolves `undefined` when awaited), grouped exactly like the real * client (`client.organization.setActive`, `client.oauth2.link`, …). `client.signOut` is the same * `vi.fn()` as the module-level `signOut` export, mirroring `const { signOut } = client`. @@ -37,7 +37,7 @@ const client = { } /** - * Controllable mock functions for `@/lib/auth/auth-client`. + * Controllable mock functions for `@/lib/auth/client`. * * Defaults: * - `mockUseSession` returns a signed-out session: `{ data: null, isPending: false, error: null, @@ -77,12 +77,12 @@ export const authClientMockFns = { } /** - * Static mock module for `@/lib/auth/auth-client`. Covers every runtime export (`client`, + * Static mock module for `@/lib/auth/client`. Covers every runtime export (`client`, * `useSession`, `useActiveOrganization`, `useSubscription`, `signOut`). * * @example * ```ts - * vi.mock('@/lib/auth/auth-client', () => authClientMock) + * vi.mock('@/lib/auth/client', () => authClientMock) * ``` */ export const authClientMock = { diff --git a/packages/testing/src/mocks/billing-attribution.mock.ts b/packages/testing/src/mocks/billing-attribution.mock.ts index a54c31a63e6..f3b2605d86e 100644 --- a/packages/testing/src/mocks/billing-attribution.mock.ts +++ b/packages/testing/src/mocks/billing-attribution.mock.ts @@ -119,7 +119,7 @@ function toUsageLimitSubscription(attribution: MockBillingAttributionSnapshot) { } /** - * Controllable mock functions for `@/lib/billing/core/billing-attribution`. + * Controllable mock functions for `@/lib/billing/core/attribution`. * * Resolvers, usage/block checks, and header `require*` readers are bare `vi.fn()`s. * Pure transforms default to the real logic without the snapshot validator: @@ -167,12 +167,12 @@ export const billingAttributionMockFns = { } /** - * Static mock module for `@/lib/billing/core/billing-attribution`, including the + * Static mock module for `@/lib/billing/core/attribution`, including the * billing-protocol header constants it re-exports. * * @example * ```ts - * vi.mock('@/lib/billing/core/billing-attribution', () => billingAttributionMock) + * vi.mock('@/lib/billing/core/attribution', () => billingAttributionMock) * ``` */ export const billingAttributionMock = { diff --git a/packages/testing/src/mocks/billing-identity-lock.mock.ts b/packages/testing/src/mocks/billing-identity-lock.mock.ts index 44b072c149a..887c4343d62 100644 --- a/packages/testing/src/mocks/billing-identity-lock.mock.ts +++ b/packages/testing/src/mocks/billing-identity-lock.mock.ts @@ -1,7 +1,7 @@ import { vi } from 'vitest' /** - * Controllable mock functions for `@/lib/billing/organizations/billing-identity-lock`. + * Controllable mock functions for `@/lib/billing/organizations/identity-lock`. * * Default: `mockAcquireUserBillingIdentityLock` resolves `undefined` (an instant no-op lock, * matching the real `Promise` signature). @@ -20,11 +20,11 @@ export const billingIdentityLockMockFns = { } /** - * Static mock module for `@/lib/billing/organizations/billing-identity-lock`. + * Static mock module for `@/lib/billing/organizations/identity-lock`. * * @example * ```ts - * vi.mock('@/lib/billing/organizations/billing-identity-lock', () => billingIdentityLockMock) + * vi.mock('@/lib/billing/organizations/identity-lock', () => billingIdentityLockMock) * ``` */ export const billingIdentityLockMock = { diff --git a/packages/testing/src/mocks/file-utils-server.mock.ts b/packages/testing/src/mocks/file-utils-server.mock.ts index bddfc567c44..8624887cef7 100644 --- a/packages/testing/src/mocks/file-utils-server.mock.ts +++ b/packages/testing/src/mocks/file-utils-server.mock.ts @@ -1,7 +1,7 @@ import { vi } from 'vitest' /** - * Controllable mock functions for `@/lib/uploads/utils/file-utils.server`. + * Controllable mock functions for `@/lib/uploads/utils/file.server`. * Every export is I/O (storage reads, URL fetches, presigning), so all defaults are bare * `vi.fn()` — configure per test. * @@ -24,11 +24,11 @@ export const fileUtilsServerMockFns = { } /** - * Static mock module for `@/lib/uploads/utils/file-utils.server`. + * Static mock module for `@/lib/uploads/utils/file.server`. * * @example * ```ts - * vi.mock('@/lib/uploads/utils/file-utils.server', () => fileUtilsServerMock) + * vi.mock('@/lib/uploads/utils/file.server', () => fileUtilsServerMock) * ``` */ export const fileUtilsServerMock = { diff --git a/packages/testing/src/mocks/file-utils.mock.ts b/packages/testing/src/mocks/file-utils.mock.ts index ddb2f1de6c6..2a7bd1d7a15 100644 --- a/packages/testing/src/mocks/file-utils.mock.ts +++ b/packages/testing/src/mocks/file-utils.mock.ts @@ -479,7 +479,7 @@ function extractWorkspaceIdFromExecutionKey(key: string): string | null { } /** - * Controllable mock functions for `@/lib/uploads/utils/file-utils`. + * Controllable mock functions for `@/lib/uploads/utils/file`. * * The real module is pure, so every default is a faithful port of the real helper * (tables included). Override per test only where the unit under test must see a @@ -692,11 +692,11 @@ export const fileUtilsMockFns = { } /** - * Static mock module for `@/lib/uploads/utils/file-utils`. Constants are the real values. + * Static mock module for `@/lib/uploads/utils/file`. Constants are the real values. * * @example * ```ts - * vi.mock('@/lib/uploads/utils/file-utils', () => fileUtilsMock) + * vi.mock('@/lib/uploads/utils/file', () => fileUtilsMock) * ``` */ export const fileUtilsMock = { diff --git a/packages/testing/src/mocks/public-shares.mock.ts b/packages/testing/src/mocks/public-shares.mock.ts index 20f00a584a6..471efb888b5 100644 --- a/packages/testing/src/mocks/public-shares.mock.ts +++ b/packages/testing/src/mocks/public-shares.mock.ts @@ -2,7 +2,7 @@ import { vi } from 'vitest' import { urlsMockFns } from './urls.mock' /** - * Mirrors `ShareValidationError` from `@/lib/public-shares/share-manager` (a plain `Error` + * Mirrors `ShareValidationError` from `@/lib/public-shares/manager` (a plain `Error` * subclass in production too): same `name` and `(message)` constructor. */ export class MockShareValidationError extends Error { @@ -13,7 +13,7 @@ export class MockShareValidationError extends Error { } /** - * Controllable mock functions for `@/lib/public-shares/share-manager`. + * Controllable mock functions for `@/lib/public-shares/manager`. * * Bare `vi.fn()` except: * - `mockBuildShareUrl(token)` → `${getBaseUrl()}/f/${token}` (faithful port; reads the shared @@ -46,12 +46,12 @@ export const publicSharesMockFns = { } /** - * Static mock module for `@/lib/public-shares/share-manager`. `ShareValidationError` is + * Static mock module for `@/lib/public-shares/manager`. `ShareValidationError` is * {@link MockShareValidationError}. * * @example * ```ts - * vi.mock('@/lib/public-shares/share-manager', () => publicSharesMock) + * vi.mock('@/lib/public-shares/manager', () => publicSharesMock) * ``` */ export const publicSharesMock = { diff --git a/packages/testing/src/mocks/workspace-context.mock.ts b/packages/testing/src/mocks/workspace-context.mock.ts index da433e1a409..1b475af08d3 100644 --- a/packages/testing/src/mocks/workspace-context.mock.ts +++ b/packages/testing/src/mocks/workspace-context.mock.ts @@ -1,6 +1,6 @@ import { vi } from 'vitest' -/** Shape of `ActiveWorkspaceApplicationContext` from `@/lib/workspaces/application/workspace-context`. */ +/** Shape of `ActiveWorkspaceApplicationContext` from `@/lib/workspaces/application/context`. */ export interface MockWorkspaceApplicationContext { workspaceId: string workspaceOrganizationId: string | null @@ -60,7 +60,7 @@ const mockResolveActiveWorkspaceApplicationContext = vi.fn( ) /** - * Controllable mock functions for `@/lib/workspaces/application/workspace-context`. + * Controllable mock functions for `@/lib/workspaces/application/context`. * * Defaults delegate like production: `resolveActive…` → `loadActive…` → `load…`, and `load…` * resolves {@link createMockWorkspaceApplicationContext} for the requested id. Override the @@ -85,11 +85,11 @@ export const workspaceContextMockFns = { } /** - * Static mock module for `@/lib/workspaces/application/workspace-context`. + * Static mock module for `@/lib/workspaces/application/context`. * * @example * ```ts - * vi.mock('@/lib/workspaces/application/workspace-context', () => workspaceContextMock) + * vi.mock('@/lib/workspaces/application/context', () => workspaceContextMock) * ``` */ export const workspaceContextMock = { diff --git a/packages/testing/src/mocks/workspace-file-folders.mock.ts b/packages/testing/src/mocks/workspace-file-folders.mock.ts index 368154c8e4a..1ed75234f5b 100644 --- a/packages/testing/src/mocks/workspace-file-folders.mock.ts +++ b/packages/testing/src/mocks/workspace-file-folders.mock.ts @@ -37,7 +37,7 @@ function buildWorkspaceFileFolderPathMapImpl(folders: MockFolderPathSource[]): M } /** - * Controllable mock functions for `@/lib/uploads/contexts/workspace/workspace-file-folder-manager`. + * Controllable mock functions for `@/lib/uploads/contexts/workspace/file-folder-manager`. * * Bare `vi.fn()` except: * - `mockNormalizeWorkspaceFileItemName` → faithful port (trims; throws on empty names, path @@ -104,13 +104,13 @@ export const workspaceFileFoldersMockFns = { const fns = workspaceFileFoldersMockFns /** - * Static mock module for `@/lib/uploads/contexts/workspace/workspace-file-folder-manager`. Error + * Static mock module for `@/lib/uploads/contexts/workspace/file-folder-manager`. Error * classes are the `Mock*Error` mirrors shared with `workspace-uploads.mock` (one class per real error). * * @example * ```ts * vi.mock( - * '@/lib/uploads/contexts/workspace/workspace-file-folder-manager', + * '@/lib/uploads/contexts/workspace/file-folder-manager', * () => workspaceFileFoldersMock * ) * ``` diff --git a/packages/testing/src/mocks/workspace-file-manager.mock.ts b/packages/testing/src/mocks/workspace-file-manager.mock.ts index a8189bef9f7..c5a4a116cf8 100644 --- a/packages/testing/src/mocks/workspace-file-manager.mock.ts +++ b/packages/testing/src/mocks/workspace-file-manager.mock.ts @@ -90,7 +90,7 @@ function vfsPath(file: MockWorkspaceFilePathFields): string { /** * Controllable mock functions for - * `@/lib/uploads/contexts/workspace/workspace-file-manager` (also spread into + * `@/lib/uploads/contexts/workspace/file-manager` (also spread into * `workspaceUploadsMock` for the `@/lib/uploads/contexts/workspace` barrel, so both import * paths share these `vi.fn()`s). * @@ -178,11 +178,11 @@ export const workspaceFileManagerMockFns = { const fns = workspaceFileManagerMockFns /** - * Static mock module for `@/lib/uploads/contexts/workspace/workspace-file-manager`. + * Static mock module for `@/lib/uploads/contexts/workspace/file-manager`. * * @example * ```ts - * vi.mock('@/lib/uploads/contexts/workspace/workspace-file-manager', () => workspaceFileManagerMock) + * vi.mock('@/lib/uploads/contexts/workspace/file-manager', () => workspaceFileManagerMock) * ``` */ export const workspaceFileManagerMock = { diff --git a/packages/testing/src/mocks/workspace-file-secret-provenance.mock.ts b/packages/testing/src/mocks/workspace-file-secret-provenance.mock.ts index cfe90e177e4..daceccedbaf 100644 --- a/packages/testing/src/mocks/workspace-file-secret-provenance.mock.ts +++ b/packages/testing/src/mocks/workspace-file-secret-provenance.mock.ts @@ -69,7 +69,7 @@ function mergeWorkspaceFileSecretProvenance( /** * Controllable mock functions for - * `@/lib/uploads/contexts/workspace/workspace-file-secret-provenance`. + * `@/lib/uploads/contexts/workspace/file-secret-provenance`. * * Every DB-backed function is a bare `vi.fn()` — including the safety predicates * (`isModelSafeWorkspaceFileKey`, `areModelSafeWorkspaceFileKeys`, @@ -111,13 +111,13 @@ const fns = workspaceFileSecretProvenanceMockFns /** * Static mock module for - * `@/lib/uploads/contexts/workspace/workspace-file-secret-provenance`. Constants carry the + * `@/lib/uploads/contexts/workspace/file-secret-provenance`. Constants carry the * real values. * * @example * ```ts * vi.mock( - * '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance', + * '@/lib/uploads/contexts/workspace/file-secret-provenance', * () => workspaceFileSecretProvenanceMock * ) * ``` diff --git a/packages/testing/src/mocks/workspace-uploads.mock.ts b/packages/testing/src/mocks/workspace-uploads.mock.ts index 8928f86669d..ea0d4e0134f 100644 --- a/packages/testing/src/mocks/workspace-uploads.mock.ts +++ b/packages/testing/src/mocks/workspace-uploads.mock.ts @@ -119,7 +119,7 @@ const fns = workspaceUploadsMockFns /** * Static mock module for the `@/lib/uploads/contexts/workspace` barrel - * (`workspace-file-manager` + `workspace-file-folder-manager`). + * (`file-manager` + `file-folder-manager`). * * The error classes extend `Error`, not `OrchestrationError`: their `name`, `code` and * message match production, but `instanceof OrchestrationError` is false. diff --git a/scripts/check-application-graph.ts b/scripts/check-application-graph.ts index 4abb45df17e..8010d942baf 100644 --- a/scripts/check-application-graph.ts +++ b/scripts/check-application-graph.ts @@ -17,7 +17,7 @@ * * The edge this guards against is invisible without a check: adding one import * to a permission-group helper once widened this graph as far as - * `lib/uploads/utils/file-utils.ts`, and the only symptom was two unrelated + * `lib/uploads/utils/file.ts`, and the only symptom was two unrelated * knowledge tests failing on a partial mock of a module they never meant to * load. Later, one import in the route wrapper pulled the whole billing graph * into every route test, and the only symptom was an unrelated OTP-route test diff --git a/scripts/check-explicit-any.baseline.json b/scripts/check-explicit-any.baseline.json index 88560e61af0..738a21d39ea 100644 --- a/scripts/check-explicit-any.baseline.json +++ b/scripts/check-explicit-any.baseline.json @@ -69,9 +69,9 @@ "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts": 1, "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand.ts": 1, "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts": 20, - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils-store.test.ts": 7, - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts": 6, - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts": 8, + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-store.test.ts": 7, + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.test.ts": 6, + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts": 8, "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx": 9, "apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx": 1, "apps/sim/app/workspace/providers/socket-provider.tsx": 10, @@ -142,32 +142,32 @@ "apps/sim/executor/execution/snapshot.ts": 5, "apps/sim/executor/execution/state.ts": 3, "apps/sim/executor/execution/types.ts": 6, - "apps/sim/executor/handlers/agent/agent-handler.test.ts": 1, - "apps/sim/executor/handlers/agent/agent-handler.ts": 30, + "apps/sim/executor/handlers/agent/handler.test.ts": 1, + "apps/sim/executor/handlers/agent/handler.ts": 30, "apps/sim/executor/handlers/agent/memory.test.ts": 8, "apps/sim/executor/handlers/agent/types.ts": 3, - "apps/sim/executor/handlers/api/api-handler.ts": 3, - "apps/sim/executor/handlers/condition/condition-handler.ts": 8, - "apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts": 3, - "apps/sim/executor/handlers/evaluator/evaluator-handler.ts": 16, - "apps/sim/executor/handlers/function/function-handler.ts": 2, - "apps/sim/executor/handlers/generic/generic-handler.ts": 3, - "apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts": 19, + "apps/sim/executor/handlers/api/handler.ts": 3, + "apps/sim/executor/handlers/condition/handler.ts": 8, + "apps/sim/executor/handlers/evaluator/handler.test.ts": 3, + "apps/sim/executor/handlers/evaluator/handler.ts": 16, + "apps/sim/executor/handlers/function/handler.ts": 2, + "apps/sim/executor/handlers/generic/handler.ts": 3, + "apps/sim/executor/handlers/human-in-the-loop/handler.ts": 19, "apps/sim/executor/handlers/human-in-the-loop/notification-params.test.ts": 1, - "apps/sim/executor/handlers/mothership/mothership-handler.ts": 2, - "apps/sim/executor/handlers/pi/pi-handler.ts": 2, + "apps/sim/executor/handlers/mothership/handler.ts": 2, + "apps/sim/executor/handlers/pi/handler.ts": 2, "apps/sim/executor/handlers/pi/search/parity.test.ts": 4, - "apps/sim/executor/handlers/response/response-handler.ts": 5, - "apps/sim/executor/handlers/router/router-handler.ts": 5, + "apps/sim/executor/handlers/response/handler.ts": 5, + "apps/sim/executor/handlers/router/handler.ts": 5, "apps/sim/executor/handlers/shared/response-format.ts": 2, - "apps/sim/executor/handlers/trigger/trigger-handler.ts": 4, - "apps/sim/executor/handlers/variables/variables-handler.ts": 16, - "apps/sim/executor/handlers/wait/wait-handler.test.ts": 3, - "apps/sim/executor/handlers/wait/wait-handler.ts": 2, + "apps/sim/executor/handlers/trigger/handler.ts": 4, + "apps/sim/executor/handlers/variables/handler.ts": 16, + "apps/sim/executor/handlers/wait/handler.test.ts": 3, + "apps/sim/executor/handlers/wait/handler.ts": 2, "apps/sim/executor/handlers/workflow/custom-block-tool-runner.test.ts": 2, "apps/sim/executor/handlers/workflow/custom-block-tool-runner.ts": 1, - "apps/sim/executor/handlers/workflow/workflow-handler.test.ts": 14, - "apps/sim/executor/handlers/workflow/workflow-handler.ts": 6, + "apps/sim/executor/handlers/workflow/handler.test.ts": 14, + "apps/sim/executor/handlers/workflow/handler.ts": 6, "apps/sim/executor/orchestrators/loop.test.ts": 8, "apps/sim/executor/orchestrators/loop.ts": 2, "apps/sim/executor/orchestrators/parallel.test.ts": 2, @@ -180,8 +180,8 @@ "apps/sim/executor/utils/parallel-expansion.ts": 3, "apps/sim/executor/utils/reference-validation.ts": 1, "apps/sim/executor/utils/run-from-block.test.ts": 11, - "apps/sim/executor/utils/subflow-utils.server.ts": 3, - "apps/sim/executor/utils/subflow-utils.ts": 1, + "apps/sim/executor/utils/subflow.server.ts": 3, + "apps/sim/executor/utils/subflow.ts": 1, "apps/sim/executor/variables/resolver.ts": 15, "apps/sim/executor/variables/resolvers/block.test.ts": 7, "apps/sim/executor/variables/resolvers/block.ts": 5, @@ -250,12 +250,12 @@ "apps/sim/lib/webhooks/providers/twilio.test.ts": 5, "apps/sim/lib/webhooks/providers/vercel.test.ts": 2, "apps/sim/lib/webhooks/providers/zoho-desk.test.ts": 8, - "apps/sim/lib/workflows/blocks/block-outputs.ts": 8, + "apps/sim/lib/workflows/blocks/outputs.ts": 8, "apps/sim/lib/workflows/comparison/compare.test.ts": 15, "apps/sim/lib/workflows/comparison/format-description.test.ts": 1, "apps/sim/lib/workflows/custom-blocks/child-execution.test.ts": 1, "apps/sim/lib/workflows/custom-tools/operations.ts": 1, - "apps/sim/lib/workflows/diff/diff-engine.ts": 4, + "apps/sim/lib/workflows/diff/engine.ts": 4, "apps/sim/lib/workflows/diff/types.ts": 1, "apps/sim/lib/workflows/editing/builders.ts": 27, "apps/sim/lib/workflows/editing/engine.ts": 20, @@ -286,7 +286,7 @@ "apps/sim/lib/workflows/subblocks/visibility.ts": 4, "apps/sim/lib/workflows/triggers/triggers.ts": 5, "apps/sim/lib/workflows/utils.test.ts": 1, - "apps/sim/lib/workflows/variables/variable-manager.test.ts": 2, + "apps/sim/lib/workflows/variables/manager.test.ts": 2, "apps/sim/lib/workspaces/permissions/utils.test.ts": 6, "apps/sim/lib/workspaces/utils.test.ts": 5, "apps/sim/providers/anthropic/streaming-tool-loop.test.ts": 21, @@ -1333,16 +1333,16 @@ "apps/sim/executor/handlers/agent/memory-harness.integration.ts": 10, "apps/sim/executor/handlers/agent/memory.ts": 3, "apps/sim/executor/handlers/agent/memory.use-cases.test.ts": 5, - "apps/sim/executor/handlers/condition/condition-handler.test.ts": 10, - "apps/sim/executor/handlers/credential/credential-handler.ts": 2, - "apps/sim/executor/handlers/generic/generic-handler.ts": 1, - "apps/sim/executor/handlers/mothership/mothership-handler.test.ts": 1, - "apps/sim/executor/handlers/mothership/mothership-handler.ts": 1, + "apps/sim/executor/handlers/condition/handler.test.ts": 10, + "apps/sim/executor/handlers/credential/handler.ts": 2, + "apps/sim/executor/handlers/generic/handler.ts": 1, + "apps/sim/executor/handlers/mothership/handler.test.ts": 1, + "apps/sim/executor/handlers/mothership/handler.ts": 1, "apps/sim/executor/handlers/pi/cloud/babysit/backend.ts": 30, "apps/sim/executor/handlers/pi/cloud/review/tools.test.ts": 4, "apps/sim/executor/handlers/pi/search/parity.test.ts": 2, "apps/sim/executor/handlers/pi/search/tool.test.ts": 1, - "apps/sim/executor/handlers/router/router-handler.test.ts": 2, + "apps/sim/executor/handlers/router/handler.test.ts": 2, "apps/sim/executor/orchestrators/parallel.test.ts": 4, "apps/sim/executor/orchestrators/parallel.ts": 1, "apps/sim/executor/utils/file-tool-processor.ts": 2, @@ -1371,12 +1371,12 @@ "apps/sim/lib/api/contracts/mothership-management-tools.test.ts": 1, "apps/sim/lib/api/contracts/v2/tables.test.ts": 1, "apps/sim/lib/api/list-query.test.ts": 9, - "apps/sim/lib/audit-logs/application/audit-log-use-cases.test.ts": 3, + "apps/sim/lib/audit-logs/application/use-cases.test.ts": 3, "apps/sim/lib/audit-logs/query.test.ts": 8, "apps/sim/lib/audit-logs/query.ts": 6, "apps/sim/lib/auth/oauth-provider-lifecycle.integration.ts": 7, "apps/sim/lib/auth/oauth-provider-registration.test.ts": 4, - "apps/sim/lib/billing/application/billing-use-cases.test.ts": 1, + "apps/sim/lib/billing/application/use-cases.test.ts": 1, "apps/sim/lib/billing/application/organization-usage/event-cursor.test.ts": 1, "apps/sim/lib/billing/calculations/usage-reservation.integration.ts": 1, "apps/sim/lib/billing/core/reporting-usage-cache.integration.ts": 2, @@ -1429,7 +1429,7 @@ "apps/sim/lib/execution/files.test.ts": 1, "apps/sim/lib/execution/isolated-vm.ts": 9, "apps/sim/lib/execution/remote-sandbox/image-registry.ts": 2, - "apps/sim/lib/execution/remote-sandbox/sandbox-files.live.test.ts": 11, + "apps/sim/lib/execution/remote-sandbox/files.live.test.ts": 11, "apps/sim/lib/execution/remote-sandbox/session-file-provenance.integration.ts": 3, "apps/sim/lib/file-parsers/complete-text.test.ts": 1, "apps/sim/lib/file-parsers/data-uri.ts": 1, @@ -1515,8 +1515,8 @@ "apps/sim/lib/knowledge/connectors/sync-content-pass.test.ts": 1, "apps/sim/lib/knowledge/connectors/sync-engine.test.ts": 1, "apps/sim/lib/knowledge/connectors/sync-primitives.ts": 1, - "apps/sim/lib/knowledge/documents/document-processing-source.test.ts": 2, - "apps/sim/lib/knowledge/documents/document-processor.ts": 8, + "apps/sim/lib/knowledge/documents/processing-source.test.ts": 2, + "apps/sim/lib/knowledge/documents/processor.ts": 8, "apps/sim/lib/knowledge/documents/embedding-checkpoints.test.ts": 2, "apps/sim/lib/knowledge/documents/ocr-checkpoints.test.ts": 3, "apps/sim/lib/knowledge/documents/processing-recovery-queue-transport.test.ts": 2, @@ -1610,7 +1610,7 @@ "apps/sim/lib/mothership/tools/sandbox-resources.ts": 1, "apps/sim/lib/mothership/tools/sandbox-session.ts": 1, "apps/sim/lib/mothership/tools/server/files/edit-content.ts": 1, - "apps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts": 11, + "apps/sim/lib/mothership/tools/server/files/edit-roundtrip.test.ts": 11, "apps/sim/lib/mothership/tools/server/files/workspace-file.ts": 2, "apps/sim/lib/mothership/tools/server/search-sources.test.ts": 2, "apps/sim/lib/mothership/transport/control.ts": 1, @@ -1665,9 +1665,9 @@ "apps/sim/lib/table/workflow-groups/service.ts": 2, "apps/sim/lib/uploads/archive.test.ts": 1, "apps/sim/lib/uploads/client/download.test.ts": 1, - "apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.test.ts": 1, + "apps/sim/lib/uploads/contexts/copilot/file-manager.test.ts": 1, "apps/sim/lib/uploads/contexts/organization-logo/application.integration.ts": 1, - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts": 1, + "apps/sim/lib/uploads/contexts/workspace/file-manager-page.test.ts": 1, "apps/sim/lib/uploads/server/markdown-export.test.ts": 1, "apps/sim/lib/uploads/server/markdown-export.ts": 3, "apps/sim/lib/users/application/authorized-apps.test.ts": 4, @@ -1721,11 +1721,11 @@ "apps/sim/lib/workflows/autolayout/core.ts": 9, "apps/sim/lib/workflows/autolayout/targeted.ts": 2, "apps/sim/lib/workflows/autolayout/utils.ts": 1, - "apps/sim/lib/workflows/blocks/block-path-calculator.ts": 1, + "apps/sim/lib/workflows/blocks/path-calculator.ts": 1, "apps/sim/lib/workflows/blocks/flatten-outputs.ts": 2, "apps/sim/lib/workflows/comparison/redact.test.ts": 2, - "apps/sim/lib/workflows/credentials/credential-extractor.ts": 3, - "apps/sim/lib/workflows/diff/diff-engine.ts": 1, + "apps/sim/lib/workflows/credentials/extractor.ts": 3, + "apps/sim/lib/workflows/diff/engine.ts": 1, "apps/sim/lib/workflows/editing/block-enablement.ts": 1, "apps/sim/lib/workflows/editing/dangling-refs.test.ts": 5, "apps/sim/lib/workflows/editing/engine.ts": 5, @@ -1747,7 +1747,7 @@ "apps/sim/lib/workflows/streaming/forward-agent-stream-events.test.ts": 16, "apps/sim/lib/workflows/streaming/streaming.ts": 4, "apps/sim/lib/workflows/subblocks/visibility.ts": 8, - "apps/sim/lib/workflows/triggers/trigger-utils.ts": 1, + "apps/sim/lib/workflows/triggers/utils.ts": 1, "apps/sim/lib/workspace-files/application/read-stored-workspace-file-record-by-key.test.ts": 1, "apps/sim/lib/workspace-files/search/admission.ts": 2, "apps/sim/lib/workspace-files/search/candidates.ts": 2, diff --git a/scripts/check-file-names.baseline.json b/scripts/check-file-names.baseline.json index 9294e57c23b..fe51488c706 100644 --- a/scripts/check-file-names.baseline.json +++ b/scripts/check-file-names.baseline.json @@ -1,131 +1 @@ -[ - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-protection-utils.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts", - "redundant-suffix\tapps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts", - "redundant-suffix\tapps/sim/executor/utils/subflow-utils.server.ts", - "redundant-suffix\tapps/sim/executor/utils/subflow-utils.test.ts", - "redundant-suffix\tapps/sim/executor/utils/subflow-utils.ts", - "redundant-suffix\tapps/sim/lib/uploads/utils/file-utils.server.test.ts", - "redundant-suffix\tapps/sim/lib/uploads/utils/file-utils.server.ts", - "redundant-suffix\tapps/sim/lib/uploads/utils/file-utils.test.ts", - "redundant-suffix\tapps/sim/lib/uploads/utils/file-utils.ts", - "stutter\tapps/sim/executor/handlers/agent/agent-handler.test.ts", - "stutter\tapps/sim/executor/handlers/agent/agent-handler.ts", - "stutter\tapps/sim/executor/handlers/api/api-handler.test.ts", - "stutter\tapps/sim/executor/handlers/api/api-handler.ts", - "stutter\tapps/sim/executor/handlers/condition/condition-handler.test.ts", - "stutter\tapps/sim/executor/handlers/condition/condition-handler.ts", - "stutter\tapps/sim/executor/handlers/credential-group/credential-group-handler.test.ts", - "stutter\tapps/sim/executor/handlers/credential-group/credential-group-handler.ts", - "stutter\tapps/sim/executor/handlers/credential/credential-handler.test.ts", - "stutter\tapps/sim/executor/handlers/credential/credential-handler.ts", - "stutter\tapps/sim/executor/handlers/evaluator/evaluator-handler.test.ts", - "stutter\tapps/sim/executor/handlers/evaluator/evaluator-handler.ts", - "stutter\tapps/sim/executor/handlers/function/function-handler.test.ts", - "stutter\tapps/sim/executor/handlers/function/function-handler.ts", - "stutter\tapps/sim/executor/handlers/generic/generic-handler.test.ts", - "stutter\tapps/sim/executor/handlers/generic/generic-handler.ts", - "stutter\tapps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts", - "stutter\tapps/sim/executor/handlers/mothership/mothership-handler.test.ts", - "stutter\tapps/sim/executor/handlers/mothership/mothership-handler.ts", - "stutter\tapps/sim/executor/handlers/pi/pi-handler.test.ts", - "stutter\tapps/sim/executor/handlers/pi/pi-handler.ts", - "stutter\tapps/sim/executor/handlers/response/response-handler.ts", - "stutter\tapps/sim/executor/handlers/router/router-handler.test.ts", - "stutter\tapps/sim/executor/handlers/router/router-handler.ts", - "stutter\tapps/sim/executor/handlers/trigger/trigger-handler.ts", - "stutter\tapps/sim/executor/handlers/variables/variables-handler.test.ts", - "stutter\tapps/sim/executor/handlers/variables/variables-handler.ts", - "stutter\tapps/sim/executor/handlers/wait/wait-handler.test.ts", - "stutter\tapps/sim/executor/handlers/wait/wait-handler.ts", - "stutter\tapps/sim/executor/handlers/workflow/workflow-handler.test.ts", - "stutter\tapps/sim/executor/handlers/workflow/workflow-handler.ts", - "stutter\tapps/sim/executor/handlers/workflow/workflow-tool-runner.test.ts", - "stutter\tapps/sim/executor/handlers/workflow/workflow-tool-runner.ts", - "stutter\tapps/sim/lib/auth/auth-client.ts", - "stutter\tapps/sim/lib/billing/application/organization-usage/organization-usage-use-cases.test.ts", - "stutter\tapps/sim/lib/catalog/projection/projection-invariants.test.ts", - "stutter\tapps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts", - "stutter\tapps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.ts", - "stutter\tapps/sim/lib/execution/execution-deadline-header.test.ts", - "stutter\tapps/sim/lib/execution/execution-deadline-header.ts", - "stutter\tapps/sim/lib/execution/execution-signal.test.ts", - "stutter\tapps/sim/lib/execution/execution-signal.ts", - "stutter\tapps/sim/lib/knowledge/connectors/connector-error.test.ts", - "stutter\tapps/sim/lib/knowledge/connectors/connector-error.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-indexing-usage.test.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processing-error.test.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processing-error.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processing-source.test.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processor-chunk-limit.test.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processor-secret-provenance.test.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-processor.ts", - "stutter\tapps/sim/lib/knowledge/documents/document-secret-provenance-update.test.ts", - "stutter\tapps/sim/lib/knowledge/knowledge-base-reference.ts", - "stutter\tapps/sim/lib/mothership/application/application-adapter.test.ts", - "stutter\tapps/sim/lib/mothership/application/application-adapter.ts", - "stutter\tapps/sim/lib/mothership/chat/chat-mcp-servers.integration.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-corpus.test.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-corpus.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-path.test.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-path.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-search.test.ts", - "stutter\tapps/sim/lib/mothership/docs/docs-search.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-edit-roundtrip.test.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-folder-application.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-intent-store.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-preview.test.ts", - "stutter\tapps/sim/lib/mothership/tools/server/files/file-preview.ts", - "stutter\tapps/sim/lib/mothership/tools/tool-activity.test.ts", - "stutter\tapps/sim/lib/mothership/tools/tool-activity.ts", - "stutter\tapps/sim/lib/mothership/tools/tool-display.ts", - "stutter\tapps/sim/lib/pptx-renderer/shapes/shape-arc.ts", - "stutter\tapps/sim/lib/selectors/server/providers/provider-http.test.ts", - "stutter\tapps/sim/lib/selectors/server/providers/provider-http.ts", - "stutter\tapps/sim/lib/table/rows/row-writes.integration.ts", - "stutter\tapps/sim/lib/uploads/contexts/chat/chat-file-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/copilot/copilot-file-manager.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/copilot/copilot-file-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/execution/execution-file-manager.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/execution/execution-file-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/knowledge-base/knowledge-base-file-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-live-doc-outbox.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-manager-download.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-manager-errors.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-manager-page.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-manager.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-query.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-reference.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-storage-accounting.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.test.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.ts", - "stutter\tapps/sim/lib/uploads/contexts/workspace/workspace-file-versions.ts", - "stutter\tapps/sim/lib/workflows/blocks/block-outputs.test.ts", - "stutter\tapps/sim/lib/workflows/blocks/block-outputs.ts", - "stutter\tapps/sim/lib/workflows/blocks/block-path-calculator.ts", - "stutter\tapps/sim/lib/workflows/blocks/block-reference-tags.test.ts", - "stutter\tapps/sim/lib/workflows/blocks/block-reference-tags.ts", - "stutter\tapps/sim/lib/workflows/credentials/credential-extractor.test.ts", - "stutter\tapps/sim/lib/workflows/credentials/credential-extractor.ts", - "stutter\tapps/sim/lib/workflows/diff/diff-engine.test.ts", - "stutter\tapps/sim/lib/workflows/diff/diff-engine.ts", - "stutter\tapps/sim/lib/workflows/references/reference-scan.ts", - "stutter\tapps/sim/lib/workflows/streaming/streaming-principal.test.ts", - "stutter\tapps/sim/lib/workflows/triggers/trigger-utils.server.ts", - "stutter\tapps/sim/lib/workflows/triggers/trigger-utils.ts", - "stutter\tapps/sim/lib/workflows/variables/variable-manager.test.ts", - "stutter\tapps/sim/lib/workflows/variables/variable-manager.ts", - "stutter\tapps/sim/lib/workflows/workflow-labels.ts", - "stutter\tapps/sim/lib/workspace-files/workspace-file-path.ts" -] +[] diff --git a/scripts/check-file-names.ts b/scripts/check-file-names.ts index de7b7d9792c..0373a1ec6de 100644 --- a/scripts/check-file-names.ts +++ b/scripts/check-file-names.ts @@ -203,8 +203,7 @@ const HOW_TO_FIX: Record = { 'redundant-suffix': 'The utils/ or helpers/ folder already names the role; drop the suffix from the file name.', stutter: - 'The parent folder already names the domain; drop the repeated prefix (lib/logs/log-views.ts → lib/logs/views.ts). If the short name collides, pick a more specific one. ' + - 'Existing `handlers//-handler.ts` files are baselined debt, not a convention to copy.', + 'The parent folder already names the domain; drop the repeated prefix (lib/logs/log-views.ts → lib/logs/views.ts). If the short name collides, pick a more specific one.', } function key(violation: Violation): string { diff --git a/scripts/check-library-content.ts b/scripts/check-library-content.ts index ea81e3786b5..adb0993bcea 100644 --- a/scripts/check-library-content.ts +++ b/scripts/check-library-content.ts @@ -47,7 +47,7 @@ import { LIBRARY_MERGED_SLUGS, LIBRARY_MOVED_BLOG_SLUGS, } from '../apps/sim/lib/library/retired-slugs' -import { foldDocsIndexPath } from '../apps/sim/lib/mothership/docs/docs-path' +import { foldDocsIndexPath } from '../apps/sim/lib/mothership/docs/path' export const SECTIONS = ['blog', 'library', 'customers', 'changelog'] as const export type Section = (typeof SECTIONS)[number] diff --git a/scripts/check-source-conventions.baseline.json b/scripts/check-source-conventions.baseline.json index 0c47556d457..ab5c946bd16 100644 --- a/scripts/check-source-conventions.baseline.json +++ b/scripts/check-source-conventions.baseline.json @@ -165,8 +165,8 @@ "apps/sim/lib/core/async-jobs/types.test.ts": 1, "apps/sim/lib/core/config/cost-multiplier.ts": 1, "apps/sim/lib/core/config/env-flags.ts": 3, - "apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts": 3, - "apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.ts": 2, + "apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.test.ts": 3, + "apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.ts": 2, "apps/sim/lib/core/rate-limiter/hosted-key/queue.test.ts": 1, "apps/sim/lib/core/rate-limiter/rate-limiter.test.ts": 2, "apps/sim/lib/core/rate-limiter/rate-limiter.ts": 2, @@ -244,7 +244,7 @@ "apps/sim/lib/mothership/tool-executor/register-handlers.ts": 6, "apps/sim/lib/mothership/tools/client/run-tool-execution.test.ts": 1, "apps/sim/lib/mothership/tools/server/files/edit-content.ts": 3, - "apps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts": 1, + "apps/sim/lib/mothership/tools/server/files/intent-store.test.ts": 1, "apps/sim/lib/mothership/tools/server/files/workspace-file.ts": 3, "apps/sim/lib/mothership/tools/server/user/get-credentials.test.ts": 1, "apps/sim/lib/mothership/tools/workflow-tools.test.ts": 1, @@ -281,14 +281,14 @@ "apps/sim/lib/table/workflow-columns.ts": 1, "apps/sim/lib/tools/falai-pricing.test.ts": 1, "apps/sim/lib/uploads/contexts/workspace/track-chat-upload.test.ts": 1, - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager-errors.test.ts": 1, - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.test.ts": 1, - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts": 1, + "apps/sim/lib/uploads/contexts/workspace/file-manager-errors.test.ts": 1, + "apps/sim/lib/uploads/contexts/workspace/file-manager.test.ts": 1, + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts": 1, "apps/sim/lib/uploads/core/storage-client.ts": 1, "apps/sim/lib/webhooks/providers/table.ts": 1, "apps/sim/lib/webhooks/providers/whatsapp.test.ts": 1, "apps/sim/lib/workflows/comparison/normalize.test.ts": 1, - "apps/sim/lib/workflows/diff/diff-engine.test.ts": 1, + "apps/sim/lib/workflows/diff/engine.test.ts": 1, "apps/sim/lib/workflows/dynamic-handle-topology.test.ts": 1, "apps/sim/lib/workflows/editing/builders.ts": 3, "apps/sim/lib/workflows/editing/engine.ts": 4, diff --git a/scripts/check-test-types.baseline.json b/scripts/check-test-types.baseline.json index 077f3941748..8a52a4a2912 100644 --- a/scripts/check-test-types.baseline.json +++ b/scripts/check-test-types.baseline.json @@ -602,7 +602,7 @@ "TS2554": 1, "TS7006": 2 }, - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.test.ts": { + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.test.ts": { "TS2739": 1 }, "apps/sim/app/workspace/[workspaceId]/w/components/workflow-diff/utils.test.ts": { @@ -818,7 +818,7 @@ "apps/sim/executor/execution/test-hooks.test.ts": { "TS2339": 3 }, - "apps/sim/executor/handlers/agent/agent-handler.test.ts": { + "apps/sim/executor/handlers/agent/handler.test.ts": { "TS18046": 2, "TS2339": 3, "TS2345": 1, @@ -828,17 +828,17 @@ "apps/sim/executor/handlers/agent/memory.test.ts": { "TS2739": 1 }, - "apps/sim/executor/handlers/condition/condition-handler.test.ts": { + "apps/sim/executor/handlers/condition/handler.test.ts": { "TS2322": 2, "TS2561": 1, "TS2739": 4, "TS2769": 3 }, - "apps/sim/executor/handlers/evaluator/evaluator-handler.test.ts": { + "apps/sim/executor/handlers/evaluator/handler.test.ts": { "TS18048": 1, "TS2345": 1 }, - "apps/sim/executor/handlers/mothership/mothership-handler.test.ts": { + "apps/sim/executor/handlers/mothership/handler.test.ts": { "TS2322": 1, "TS2345": 1, "TS2352": 1, @@ -852,10 +852,10 @@ "apps/sim/executor/handlers/pi/cloud/review/backend.test.ts": { "TS2345": 1 }, - "apps/sim/executor/handlers/variables/variables-handler.test.ts": { + "apps/sim/executor/handlers/variables/handler.test.ts": { "TS2339": 1 }, - "apps/sim/executor/handlers/workflow/workflow-handler.test.ts": { + "apps/sim/executor/handlers/workflow/handler.test.ts": { "TS2493": 1, "TS2571": 1 }, @@ -1027,7 +1027,7 @@ "apps/sim/lib/billing/authorization.test.ts": { "TS2554": 1 }, - "apps/sim/lib/billing/core/billing-attribution.test.ts": { + "apps/sim/lib/billing/core/attribution.test.ts": { "TS2345": 6 }, "apps/sim/lib/billing/core/subscription.test.ts": { @@ -1072,10 +1072,10 @@ "apps/sim/lib/browser-agent/transport.test.ts": { "TS2345": 1 }, - "apps/sim/lib/catalog/application/catalog-reads.test.ts": { + "apps/sim/lib/catalog/application/reads.test.ts": { "TS2345": 1 }, - "apps/sim/lib/catalog/projection/catalog-sweep.test.ts": { + "apps/sim/lib/catalog/projection/sweep.test.ts": { "TS2345": 1 }, "apps/sim/lib/charts/option.test.ts": { @@ -1146,7 +1146,7 @@ "TS2322": 1, "TS2739": 1 }, - "apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.test.ts": { + "apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.test.ts": { "TS2352": 1 }, "apps/sim/lib/core/rate-limiter/provider-admission.test.ts": { @@ -1226,7 +1226,7 @@ "TS2322": 1, "TS2345": 1 }, - "apps/sim/lib/credentials/application/credential-crud.test.ts": { + "apps/sim/lib/credentials/application/crud.test.ts": { "TS2345": 1 }, "apps/sim/lib/credentials/application/list-workspace-credentials.test.ts": { @@ -1331,7 +1331,7 @@ "TS2345": 3, "TS2739": 8 }, - "apps/sim/lib/execution/remote-sandbox/sandbox-spec.test.ts": { + "apps/sim/lib/execution/remote-sandbox/spec.test.ts": { "TS2345": 2 }, "apps/sim/lib/execution/remote-sandbox/session-file-snapshot.test.ts": { @@ -1655,7 +1655,7 @@ "apps/sim/lib/knowledge/chunks/keyset-sql.test.ts": { "TS2345": 2 }, - "apps/sim/lib/knowledge/connectors/connector-error.test.ts": { + "apps/sim/lib/knowledge/connectors/error.test.ts": { "TS2345": 1 }, "apps/sim/lib/knowledge/connectors/directory-queue.test.ts": { @@ -1686,11 +1686,11 @@ "TS2345": 2, "TS2769": 1 }, - "apps/sim/lib/knowledge/documents/document-indexing-usage.test.ts": { + "apps/sim/lib/knowledge/documents/indexing-usage.test.ts": { "TS2345": 2, "TS2739": 2 }, - "apps/sim/lib/knowledge/documents/document-processing-source.test.ts": { + "apps/sim/lib/knowledge/documents/processing-source.test.ts": { "TS2345": 4 }, "apps/sim/lib/knowledge/documents/processing-lane.test.ts": { diff --git a/scripts/check-unused-exports.baseline.json b/scripts/check-unused-exports.baseline.json index 48f475d590b..6426aac971c 100644 --- a/scripts/check-unused-exports.baseline.json +++ b/scripts/check-unused-exports.baseline.json @@ -616,8 +616,8 @@ "apps/sim/app/workspace/[workspaceId]/upgrade/components/index.ts#UpgradePlanCardProps", "apps/sim/app/workspace/[workspaceId]/upgrade/components/plan-card/index.ts#UpgradePlanCardProps", "apps/sim/app/workspace/[workspaceId]/upgrade/hooks/index.ts#UpgradeState", - "apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts#COMMAND_DEFINITIONS", - "apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts#CommandId", + "apps/sim/app/workspace/[workspaceId]/utils/commands.ts#COMMAND_DEFINITIONS", + "apps/sim/app/workspace/[workspaceId]/utils/commands.ts#CommandId", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/block-menu/index.ts#BlockMenuProps", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/canvas-menu/index.ts#CanvasMenuProps", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks/index.ts#MAX_CHAT_FILE_SIZE_BYTES", @@ -702,13 +702,13 @@ "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts#useWand", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-execution-handoff.ts#isBlockInActiveExecutionHandoff", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand.ts#WandConfig", - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts#BlockDiffStatus", + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring.ts#BlockDiffStatus", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts#resolveParentChildSelectionConflicts", "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts#resolveSelectionContextConflicts", - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts#addCancelledConsoleEntry", - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts#buildExecutionTiming", - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts#markOutgoingEdgesFromOutput", - "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts#updateActiveBlockRefCount", + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts#addCancelledConsoleEntry", + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts#buildExecutionTiming", + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts#markOutgoingEdgesFromOutput", + "apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution.ts#updateActiveBlockRefCount", "apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts#PreviewBlock", "apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts#PreviewContextMenu", "apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts#PreviewEditor", @@ -4047,7 +4047,7 @@ "apps/sim/lib/atlassian/discovery.ts#ATLASSIAN_DISCOVERY_RETRY_OPTIONS", "apps/sim/lib/audio/extractor.ts#isAudioFile", "apps/sim/lib/audit-logs/application/authorized-audit-log-use-case.ts#AuthorizedAuditLogContext", - "apps/sim/lib/auth/auth-client.ts#useActiveOrganization", + "apps/sim/lib/auth/client.ts#useActiveOrganization", "apps/sim/lib/auth/connectors/managed-oauth.ts#ManagedOAuthConnectorIdentity", "apps/sim/lib/auth/connectors/managed-oauth.ts#ManagedOAuthProfileIdentity", "apps/sim/lib/auth/connectors/managed-oauth.ts#ManagedOAuthScopeResolution", @@ -4082,10 +4082,10 @@ "apps/sim/lib/billing/client/utils.ts#isAtLeastTeam", "apps/sim/lib/billing/concurrency-limits.ts#getBillingConcurrencyLimits", "apps/sim/lib/billing/constants.ts#CreditTier", - "apps/sim/lib/billing/core/billing-attribution.ts#BILLING_ACCOUNT_DECISION_HEADER_MAX_BYTES", - "apps/sim/lib/billing/core/billing-attribution.ts#BillingPeriodSnapshot", - "apps/sim/lib/billing/core/billing-attribution.ts#PayerSubscriptionSnapshot", - "apps/sim/lib/billing/core/billing-attribution.ts#resolveOrganizationBillingPayer", + "apps/sim/lib/billing/core/attribution.ts#BILLING_ACCOUNT_DECISION_HEADER_MAX_BYTES", + "apps/sim/lib/billing/core/attribution.ts#BillingPeriodSnapshot", + "apps/sim/lib/billing/core/attribution.ts#PayerSubscriptionSnapshot", + "apps/sim/lib/billing/core/attribution.ts#resolveOrganizationBillingPayer", "apps/sim/lib/billing/core/organization.ts#getOrgMemberLedgerByUser", "apps/sim/lib/billing/core/reporting-period.ts#ENTERPRISE_REPORTING_PERIOD_INTERVAL_METADATA_KEY", "apps/sim/lib/billing/core/subscription.ts#SubscriptionMetadata", @@ -4210,7 +4210,7 @@ "apps/sim/lib/chunkers/utils.ts#assertPositiveSafeInteger", "apps/sim/lib/chunkers/utils.ts#iterateWordBoundaryChunkSpans", "apps/sim/lib/cleanup/chat-cleanup.ts#deleteStorageFiles", - "apps/sim/lib/collab-doc/collab-state.ts#CollabDocStateToken", + "apps/sim/lib/collab-doc/state.ts#CollabDocStateToken", "apps/sim/lib/colors/brightness.ts#isLightColor", "apps/sim/lib/colors/index.ts#isLightColor", "apps/sim/lib/compare/data/index.ts#ProseSegment", @@ -4255,7 +4255,7 @@ "apps/sim/lib/core/http/classes.ts#DeliveryDeclaration", "apps/sim/lib/core/http/classes.ts#DeliveryOutcome", "apps/sim/lib/core/idempotency/index.ts#pollingIdempotency", - "apps/sim/lib/core/rate-limiter/hosted-key/hosted-key-rate-limiter.ts#resetHostedKeyRateLimiter", + "apps/sim/lib/core/rate-limiter/hosted-key/rate-limiter.ts#resetHostedKeyRateLimiter", "apps/sim/lib/core/rate-limiter/hosted-key/index.ts#DEFAULT_BURST_MULTIPLIER", "apps/sim/lib/core/rate-limiter/hosted-key/index.ts#DEFAULT_WINDOW_MS", "apps/sim/lib/core/rate-limiter/hosted-key/index.ts#HostedKeyRateLimiter", @@ -4396,7 +4396,7 @@ "apps/sim/lib/execution/constants.ts#BINARY_DOC_TASKS", "apps/sim/lib/execution/constants.ts#MAX_DOCUMENT_PREVIEW_CODE_BYTES", "apps/sim/lib/execution/durable-secret-provenance-telemetry.ts#DurableSecretProvenanceWriteCause", - "apps/sim/lib/execution/execution-signal.ts#ExecutionSignalHandler", + "apps/sim/lib/execution/signal.ts#ExecutionSignalHandler", "apps/sim/lib/execution/files.ts#processExecutionFile", "apps/sim/lib/execution/model-input-provenance.ts#OPAQUE_MODEL_INPUT_PROVENANCE_UNAVAILABLE_ERROR", "apps/sim/lib/execution/model-input-provenance.ts#OPAQUE_MODEL_INPUT_RESOLVED_SECRET_ERROR", @@ -4422,8 +4422,8 @@ "apps/sim/lib/execution/remote-sandbox/output-limits.ts#SANDBOX_OUTPUT_FILE_INVALID_CODE", "apps/sim/lib/execution/remote-sandbox/output-limits.ts#SANDBOX_OUTPUT_LIMIT_CODE", "apps/sim/lib/execution/remote-sandbox/output-limits.ts#SANDBOX_OUTPUT_NOT_EXPORTABLE_CODE", - "apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts#MAX_DEPENDENCY_LENGTH", - "apps/sim/lib/execution/remote-sandbox/sandbox-spec.ts#MAX_SYSTEM_PACKAGE_LENGTH", + "apps/sim/lib/execution/remote-sandbox/spec.ts#MAX_DEPENDENCY_LENGTH", + "apps/sim/lib/execution/remote-sandbox/spec.ts#MAX_SYSTEM_PACKAGE_LENGTH", "apps/sim/lib/execution/remote-sandbox/types.ts#SandboxCodeError", "apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts#SandboxSpecUpdate", "apps/sim/lib/execution/remote-sandbox/workspace-sandboxes.ts#WORKSPACE_SANDBOX_NAME_INDEX", @@ -4610,7 +4610,7 @@ "apps/sim/lib/knowledge/constants.ts#NumberTagSlot", "apps/sim/lib/knowledge/constants.ts#TAG_SLOTS", "apps/sim/lib/knowledge/constants.ts#TagSlot", - "apps/sim/lib/knowledge/documents/document-processing-error.ts#DOCUMENT_PROCESSING_FAILURE_CODES", + "apps/sim/lib/knowledge/documents/processing-error.ts#DOCUMENT_PROCESSING_FAILURE_CODES", "apps/sim/lib/knowledge/documents/processing-claim.ts#PROCESSING_DISPATCH_FAILURE_MESSAGE", "apps/sim/lib/knowledge/documents/processing-outbox-event.ts#DEFERRED_RETRY_CHECK_MAX_ATTEMPTS", "apps/sim/lib/knowledge/documents/processing-payload.ts#NonWorkspaceDocumentProcessingBillingContext", @@ -4788,7 +4788,7 @@ "apps/sim/lib/mothership/constants.ts#TOOL_RESULT_ESTIMATED_CHARS_PER_TOKEN", "apps/sim/lib/mothership/constants.ts#TOOL_RESULT_MAX_INLINE_CHARS", "apps/sim/lib/mothership/constants.ts#TOOL_RESULT_MAX_INLINE_TOKENS", - "apps/sim/lib/mothership/docs/docs-path.ts#DOCS_INDEX_SUFFIX", + "apps/sim/lib/mothership/docs/path.ts#DOCS_INDEX_SUFFIX", "apps/sim/lib/mothership/inbox/types.ts#InboxTaskStatus", "apps/sim/lib/mothership/persistence/tool-permission/index.ts#getToolPermissionDecision", "apps/sim/lib/mothership/persistence/tool-permission/index.ts#isToolPermissionDecision", @@ -4872,7 +4872,7 @@ "apps/sim/lib/mothership/tools/server/router.ts#ExecuteResponseSuccess", "apps/sim/lib/mothership/tools/server/settings-collections.ts#initialSettingsPage", "apps/sim/lib/mothership/tools/server/settings-collections.ts#projectSettingsGroup", - "apps/sim/lib/mothership/tools/tool-activity.ts#TOOL_ACTIVITIES", + "apps/sim/lib/mothership/tools/activity.ts#TOOL_ACTIVITIES", "apps/sim/lib/mothership/tools/workflow-tools.ts#CopilotWorkflowToolBindingError", "apps/sim/lib/mothership/vfs/operations.ts#GrepOutputMode", "apps/sim/lib/mothership/vfs/operations.ts#ReadResult", @@ -4925,8 +4925,8 @@ "apps/sim/lib/pptx-renderer/utils/color.ts#rgbToHsl", "apps/sim/lib/pptx-renderer/utils/color.ts#toCssColor", "apps/sim/lib/pptx-renderer/utils/media.ts#getMimeType", - "apps/sim/lib/public-shares/share-manager.ts#buildShareUrl", - "apps/sim/lib/public-shares/share-manager.ts#getSharesForResources", + "apps/sim/lib/public-shares/manager.ts#buildShareUrl", + "apps/sim/lib/public-shares/manager.ts#getSharesForResources", "apps/sim/lib/realtime/notify.ts#LiveFileDocMergeStatus", "apps/sim/lib/resource-policies/conditions/index.ts#RESOURCE_POLICY_CONDITION_DEFINITIONS", "apps/sim/lib/resource-policies/conditions/index.ts#RESOURCE_POLICY_CONDITION_OPERATORS", @@ -4992,12 +4992,12 @@ "apps/sim/lib/sim-search/live/providers.ts#LIVE_SEARCH_PROVIDERS", "apps/sim/lib/sim-search/live/service-sources.ts#LiveServiceSource", "apps/sim/lib/sim-search/live/types.ts#NativeAccessReference", - "apps/sim/lib/sim-search/search-params.ts#SearchSetupSource", + "apps/sim/lib/sim-search/params.ts#SearchSetupSource", "apps/sim/lib/skills/application/authorization.ts#SKILL_DELEGATION_AUDIENCE", "apps/sim/lib/skills/application/operations.ts#SkillOperation", "apps/sim/lib/skills/application/use-cases.ts#SkillEditorTarget", "apps/sim/lib/skills/orchestration/index.ts#SkillOrchestrationErrorCode", - "apps/sim/lib/skills/orchestration/skill-lifecycle.ts#SkillOrchestrationErrorCode", + "apps/sim/lib/skills/orchestration/lifecycle.ts#SkillOrchestrationErrorCode", "apps/sim/lib/slack-search/manifest.ts#SLACK_SEARCH_WEBHOOK_PATH", "apps/sim/lib/slack-search/types.ts#slackSearchMessageSchema", "apps/sim/lib/status-page.ts#StatusPageIndicator", @@ -5079,16 +5079,16 @@ "apps/sim/lib/uploads/archive.ts#MAX_ARCHIVE_ENTRIES", "apps/sim/lib/uploads/archive.ts#MAX_ARCHIVE_TOTAL_BYTES", "apps/sim/lib/uploads/client/upload-session.ts#UploadSessionTransportError", - "apps/sim/lib/uploads/contexts/copilot/copilot-file-manager.ts#isSupportedFileType", + "apps/sim/lib/uploads/contexts/copilot/file-manager.ts#isSupportedFileType", "apps/sim/lib/uploads/contexts/copilot/index.ts#CopilotStoredFile", "apps/sim/lib/uploads/contexts/organization-logo/application.ts#organizationLogoOperation", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-folder-manager.ts#getWorkspaceFileFolder", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts#CHAT_DISPLAY_NAME_INDEX", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts#PermanentlyDeleteWorkspaceFileResult", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts#WorkspaceFileKeyOwnershipError", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts#fileExistsInWorkspace", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-manager.ts#matchesWorkspaceFilePattern", - "apps/sim/lib/uploads/contexts/workspace/workspace-file-secret-provenance.ts#WorkspaceFileSecretProvenanceEnvelope", + "apps/sim/lib/uploads/contexts/workspace/file-folder-manager.ts#getWorkspaceFileFolder", + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts#CHAT_DISPLAY_NAME_INDEX", + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts#PermanentlyDeleteWorkspaceFileResult", + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts#WorkspaceFileKeyOwnershipError", + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts#fileExistsInWorkspace", + "apps/sim/lib/uploads/contexts/workspace/file-manager.ts#matchesWorkspaceFilePattern", + "apps/sim/lib/uploads/contexts/workspace/file-secret-provenance.ts#WorkspaceFileSecretProvenanceEnvelope", "apps/sim/lib/uploads/index.ts#getStorageConfig", "apps/sim/lib/uploads/server/heic.ts#MAX_TRANSCODE_INPUT_BYTES", "apps/sim/lib/uploads/shared/types.ts#WORKSPACE_SCOPED_CONTEXTS", @@ -5109,7 +5109,7 @@ "apps/sim/lib/uploads/upload-session/service.ts#UPLOAD_SESSION_TTL_MS", "apps/sim/lib/uploads/upload-session/service.ts#UploadSessionStatus", "apps/sim/lib/uploads/upload-session/service.ts#UploadTransferMethod", - "apps/sim/lib/uploads/utils/file-utils.ts#isSupportedFileType", + "apps/sim/lib/uploads/utils/file.ts#isSupportedFileType", "apps/sim/lib/uploads/utils/validation.ts#ACCEPTED_FILE_EXTENSIONS", "apps/sim/lib/uploads/utils/validation.ts#SUPPORTED_ATTACHMENT_EXTENSIONS", "apps/sim/lib/uploads/utils/validation.ts#SUPPORTED_MIME_TYPES", @@ -5153,8 +5153,8 @@ "apps/sim/lib/workflows/autolayout/index.ts#shouldSkipAutoLayout", "apps/sim/lib/workflows/autolayout/index.ts#snapPositionToGrid", "apps/sim/lib/workflows/autolayout/utils.ts#createBoundingBox", - "apps/sim/lib/workflows/blocks/block-outputs.ts#getEvaluatorMetricOutputs", - "apps/sim/lib/workflows/blocks/block-outputs.ts#getToolOutputs", + "apps/sim/lib/workflows/blocks/outputs.ts#getEvaluatorMetricOutputs", + "apps/sim/lib/workflows/blocks/outputs.ts#getToolOutputs", "apps/sim/lib/workflows/blocks/canvas-sentence-validation.ts#SentenceCoverage", "apps/sim/lib/workflows/blocks/flatten-outputs.ts#EXCLUDED_OUTPUT_TYPES", "apps/sim/lib/workflows/comparison/compare.ts#BlockFieldChange", @@ -5225,7 +5225,7 @@ "apps/sim/lib/workflows/references/import-plan.ts#ImportResourceMapping", "apps/sim/lib/workflows/references/import-plan.ts#parsePortableWorkflow", "apps/sim/lib/workflows/references/import-plan.ts#referenceOccurrenceKey", - "apps/sim/lib/workflows/references/reference-scan.ts#collectReferencedResourceIds", + "apps/sim/lib/workflows/references/scan.ts#collectReferencedResourceIds", "apps/sim/lib/workflows/references/remap-references.ts#CUSTOM_BLOCK_REFERENCE_KEY", "apps/sim/lib/workflows/references/remap-references.ts#REGISTRY_KIND_TO_FORK_KIND", "apps/sim/lib/workflows/references/remap-references.ts#TEXT_DEPENDENT_TYPES", @@ -5248,7 +5248,7 @@ "apps/sim/lib/workflows/tool-input/usage-control.ts#AGENT_TOOL_USAGE_CONTROL_CANONICAL_ID", "apps/sim/lib/workflows/tool-input/usage-control.ts#DEFAULT_AGENT_TOOL_USAGE_CONTROL", "apps/sim/lib/workflows/triggers/input-definition-triggers.ts#INPUT_DEFINITION_TRIGGER_TYPES", - "apps/sim/lib/workflows/triggers/trigger-utils.ts#groupTriggersByPath", + "apps/sim/lib/workflows/triggers/utils.ts#groupTriggersByPath", "apps/sim/lib/workflows/triggers/triggers.ts#TRIGGER_REFERENCE_ALIAS_MAP", "apps/sim/lib/workflows/triggers/triggers.ts#TriggerReferenceAlias", "apps/sim/lib/workflows/triggers/triggers.ts#classifyStartBlock", @@ -5284,11 +5284,11 @@ "apps/sim/lib/workspace-files/application/style-workspace-file.ts#StyleWorkspaceFileInput", "apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts#UpdateWorkspaceFileDimensionsInput", "apps/sim/lib/workspace-files/application/update-workspace-file-dimensions.ts#UpdateWorkspaceFileDimensionsResult", - "apps/sim/lib/workspace-files/application/workspace-file-folders.ts#CreateWorkspaceFileFolderResult", - "apps/sim/lib/workspace-files/application/workspace-file-folders.ts#DeleteWorkspaceFileFolderResult", - "apps/sim/lib/workspace-files/application/workspace-file-folders.ts#EnsureWorkspaceFileFolderPathResult", - "apps/sim/lib/workspace-files/application/workspace-file-folders.ts#ListWorkspaceFileFoldersResult", - "apps/sim/lib/workspace-files/application/workspace-file-folders.ts#UpdateWorkspaceFileFolderResult", + "apps/sim/lib/workspace-files/application/folders.ts#CreateWorkspaceFileFolderResult", + "apps/sim/lib/workspace-files/application/folders.ts#DeleteWorkspaceFileFolderResult", + "apps/sim/lib/workspace-files/application/folders.ts#EnsureWorkspaceFileFolderPathResult", + "apps/sim/lib/workspace-files/application/folders.ts#ListWorkspaceFileFoldersResult", + "apps/sim/lib/workspace-files/application/folders.ts#UpdateWorkspaceFileFolderResult", "apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts#WriteWorkspaceFileBufferByPathInput", "apps/sim/lib/workspace-files/application/write-workspace-file-by-path.ts#WriteWorkspaceFileByPathResult", "apps/sim/lib/workspace-files/artifact-stylesheet.ts#ARTIFACT_TOKENS", @@ -5351,7 +5351,7 @@ "apps/sim/providers/utils.ts#MODELS_WITH_THINKING", "apps/sim/providers/utils.ts#MODELS_WITH_VERBOSITY", "apps/sim/providers/utils.ts#providers", - "apps/sim/sandbox-tasks/registry.ts#SANDBOX_TASKS", + "apps/sim/sandboxes/registry.ts#SANDBOX_TASKS", "apps/sim/serializer/index.ts#selectToolId", "apps/sim/stores/canvas-mode/store.ts#CanvasMode", "apps/sim/stores/execution/store.ts#useCurrentWorkflowExecution", diff --git a/scripts/sync-docs-manifest.ts b/scripts/sync-docs-manifest.ts index 1cf741025d8..c8a87b0db48 100644 --- a/scripts/sync-docs-manifest.ts +++ b/scripts/sync-docs-manifest.ts @@ -26,10 +26,7 @@ import { readdir, readFile, writeFile } from 'node:fs/promises' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' -import { - foldDocsIndexPath, - UNMOUNTED_DOCS_SECTIONS, -} from '../apps/sim/lib/mothership/docs/docs-path' +import { foldDocsIndexPath, UNMOUNTED_DOCS_SECTIONS } from '../apps/sim/lib/mothership/docs/path' import { formatGeneratedSource } from './format-generated-source' const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url)) diff --git a/scripts/test-patterns-baseline.json b/scripts/test-patterns-baseline.json index 48a78d25e8f..30969c0dc8f 100644 --- a/scripts/test-patterns-baseline.json +++ b/scripts/test-patterns-baseline.json @@ -13,7 +13,7 @@ "global-remock\tapps/sim/tools/pitchbook/pitchbook.test.ts\t@/tools/registry", "global-remock\tapps/sim/tools/semrush/semrush.test.ts\t@/tools/registry", "local-factory\tapps/sim/app/(interfaces)/chat/components/message/message.test.tsx\t@sim/emcn", - "local-factory\tapps/sim/app/api/copilot/api-keys/validate/route.test.ts\t@/lib/billing/core/billing-attribution", + "local-factory\tapps/sim/app/api/copilot/api-keys/validate/route.test.ts\t@/lib/billing/core/attribution", "local-factory\tapps/sim/app/api/permission-groups/user/route.test.ts\t@/lib/permission-groups/resolve.server", "local-factory\tapps/sim/app/api/webhooks/trigger/[path]/route.test.ts\t@/lib/webhooks/processor", "local-factory\tapps/sim/app/slack-search/connect/[token]/page.test.tsx\t@sim/emcn", @@ -52,18 +52,18 @@ "local-factory\tapps/sim/lib/mothership/chat/application/use-cases.test.ts\t@/lib/core/application/workspace-authorization", "local-factory\tapps/sim/lib/mothership/chat/payload.test.ts\t@/tools/utils", "local-factory\tapps/sim/lib/mothership/request/application/recover-stream.test.ts\t@/lib/core/application/workspace-authorization", - "local-factory\tapps/sim/lib/mothership/request/lifecycle/run.test.ts\t@/lib/billing/core/billing-attribution", + "local-factory\tapps/sim/lib/mothership/request/lifecycle/run.test.ts\t@/lib/billing/core/attribution", "local-factory\tapps/sim/lib/mothership/tasks/application/tasks.test.ts\t@/lib/core/application/workspace-authorization", "local-factory\tapps/sim/lib/mothership/tools/server/open-resource.test.ts\t@/lib/knowledge/application/knowledge-bases", "local-factory\tapps/sim/lib/mothership/tools/server/open-resource.test.ts\t@/lib/table/application/tables", "local-factory\tapps/sim/lib/tool-execution/application/execute-tool.test.ts\t@/tools/utils", - "local-factory\tapps/sim/lib/uploads/contexts/workspace/workspace-file-storage-cleanup-outbox.test.ts\t@/lib/core/outbox/service", + "local-factory\tapps/sim/lib/uploads/contexts/workspace/file-storage-cleanup-outbox.test.ts\t@/lib/core/outbox/service", "local-factory\tapps/sim/lib/webhooks/deploy.test.ts\t@/blocks", "local-factory\tapps/sim/lib/workflows/autolayout/change-set.test.ts\t@/blocks", "local-factory\tapps/sim/lib/workflows/autolayout/core.test.ts\t@/blocks", "local-factory\tapps/sim/lib/workflows/autolayout/targeted.test.ts\t@/blocks", "local-factory\tapps/sim/lib/workflows/autolayout/utils.test.ts\t@/blocks", - "local-factory\tapps/sim/lib/workflows/diff/diff-engine.test.ts\t@/blocks", + "local-factory\tapps/sim/lib/workflows/diff/engine.test.ts\t@/blocks", "local-factory\tapps/sim/lib/workflows/subblocks/display.test.ts\t@/blocks", "local-factory\tapps/sim/serializer/checkbox-list.test.ts\t@/blocks", "local-factory\tapps/sim/serializer/custom-block-lifecycle.test.ts\t@/blocks", @@ -182,7 +182,7 @@ "real-wait\tapps/sim/lib/mothership/tools/client/local-filesystem.test.ts\tsleep() #1", "real-wait\tapps/sim/lib/mothership/tools/client/local-filesystem.test.ts\tsleep() #2", "real-wait\tapps/sim/lib/mothership/tools/client/run-tool-execution.test.ts\tsleep() #1", - "real-wait\tapps/sim/lib/mothership/tools/server/files/file-intent-store.test.ts\tsleep() #1", + "real-wait\tapps/sim/lib/mothership/tools/server/files/intent-store.test.ts\tsleep() #1", "real-wait\tapps/sim/lib/table/import.test.ts\tsleep() #1", "real-wait\tpackages/audit/src/log.test.ts\tsleep() #1", "real-wait\tpackages/sim-cli/src/commands/protocol/files-get.test.ts\tsleep() #1", diff --git a/vitest.integration-durations.json b/vitest.integration-durations.json index 678b6c76b1f..b42e6a1a7b0 100644 --- a/vitest.integration-durations.json +++ b/vitest.integration-durations.json @@ -46,7 +46,7 @@ "apps/sim/lib/credential-groups/__integration__/hubspot-mcp.integration.ts": 2.3, "apps/sim/lib/credential-groups/__integration__/organization-account-outbound.integration.ts": 1.1, "apps/sim/lib/credentials/__integration__/copilot-credential-members.integration.ts": 3.2, - "apps/sim/lib/credentials/application/credential-sharing.integration.ts": 1.3, + "apps/sim/lib/credentials/application/sharing.integration.ts": 1.3, "apps/sim/lib/credentials/client-credential-accounts/vanta-token.integration.ts": 0.8, "apps/sim/lib/dashboards/repository.integration.ts": 0.3, "apps/sim/lib/data-drains/service.integration.ts": 8.4, @@ -56,7 +56,7 @@ "apps/sim/lib/desktop/application/executor.integration.ts": 1.5, "apps/sim/lib/desktop/application/import.integration.ts": 0.9, "apps/sim/lib/desktop/executor/bound-turn.integration.ts": 65.4, - "apps/sim/lib/desktop/executor/desktop-call-classifier.integration.ts": 0.4, + "apps/sim/lib/desktop/executor/call-classifier.integration.ts": 0.4, "apps/sim/lib/desktop/source-request.integration.ts": 1.6, "apps/sim/lib/environment/execution-environment.integration.ts": 0.5, "apps/sim/lib/execution/remote-sandbox/session-file-provenance.integration.ts": 0.5, @@ -142,7 +142,7 @@ "apps/sim/lib/mothership/async-runs/tool-identity.integration.ts": 0.5, "apps/sim/lib/mothership/billing/service-store.integration.ts": 0.6, "apps/sim/lib/mothership/chat/application/set-effort.integration.ts": 0.7, - "apps/sim/lib/mothership/chat/chat-mcp-servers.integration.ts": 0.8, + "apps/sim/lib/mothership/chat/mcp-servers.integration.ts": 0.8, "apps/sim/lib/mothership/request/session/buffer-ttl.integration.ts": 12.3, "apps/sim/lib/mothership/request/session/recovery-storm.integration.ts": 215.6, "apps/sim/lib/mothership/request/session/replay-budget.integration.ts": 34, @@ -165,7 +165,7 @@ "apps/sim/lib/table/application/row-audit.integration.ts": 1.2, "apps/sim/lib/table/dispatcher.integration.ts": 0.6, "apps/sim/lib/table/row-changes.integration.ts": 0.7, - "apps/sim/lib/table/rows/row-writes.integration.ts": 10.7, + "apps/sim/lib/table/rows/writes.integration.ts": 10.7, "apps/sim/lib/table/rows/secret-provenance.integration.ts": 2.2, "apps/sim/lib/uploads/contexts/organization-logo/application.integration.ts": 0.6, "apps/sim/lib/uploads/contexts/workspace/__integration__/file-names.integration.ts": 2.1,