diff --git a/apps/sim/app/_shell/paste-admission-guard.tsx b/apps/sim/app/_shell/paste-admission-guard.tsx
index 2555c1d698c..1fd970215db 100644
--- a/apps/sim/app/_shell/paste-admission-guard.tsx
+++ b/apps/sim/app/_shell/paste-admission-guard.tsx
@@ -4,6 +4,7 @@ import { useEffect, useRef } from 'react'
 import { useToast } from '@sim/emcn'
 import { assessTextPaste, formatPasteLimit, PASTE_LIMITS } from '@sim/utils/paste'
 import { readSelectionContextFromClipboard } from '@/lib/mothership/chat/selection-clipboard'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 
 const EDITABLE_TARGET_SELECTOR =
   'input:not([type="file"]):not([type="checkbox"]):not([type="radio"]):not([type="button"]):not([type="submit"]):not([type="hidden"]), textarea, [contenteditable]:not([contenteditable="false"]), .monaco-editor, .xterm'
@@ -23,6 +24,27 @@ function clipboardHasImageFile(data: DataTransfer | null): boolean {
   )
 }
 
+function selectionOwnerHints(element: Element | null): FileOperationOwner[] {
+  const encoded = element?.getAttribute('data-paste-selection-owners')
+  if (encoded !== null && encoded !== undefined) {
+    try {
+      const parsed: unknown = JSON.parse(encoded)
+      if (!Array.isArray(parsed)) return []
+      const owners: FileOperationOwner[] = []
+      for (const candidate of parsed) {
+        const owner = FileOperationOwner.safeParse(candidate)
+        if (!owner.success) return []
+        owners.push(owner.data)
+      }
+      return owners
+    } catch {
+      return []
+    }
+  }
+  const workspaceId = element?.getAttribute('data-paste-selection-context')
+  return workspaceId ? [{ entityType: 'workspace', entityId: workspaceId }] : []
+}
+
 /**
  * Last-resort admission for every editable workspace surface. Specialized editors publish their
  * downstream ceiling on an ancestor with `data-paste-max-bytes`; controls without one inherit a
@@ -42,13 +64,15 @@ export function PasteAdmissionGuard() {
         return
       }
 
-      const acceptsSelectionContext = event.target.closest('[data-paste-selection-context]')
-      const destinationWorkspaceId = acceptsSelectionContext?.getAttribute(
-        'data-paste-selection-context'
+      const acceptsSelectionContext = event.target.closest(
+        '[data-paste-selection-owners], [data-paste-selection-context]'
       )
       if (
-        destinationWorkspaceId &&
-        readSelectionContextFromClipboard(event.clipboardData, destinationWorkspaceId)
+        acceptsSelectionContext &&
+        readSelectionContextFromClipboard(
+          event.clipboardData,
+          selectionOwnerHints(acceptsSelectionContext)
+        )
       ) {
         return
       }
diff --git a/apps/sim/app/api/copilot/chat/queries.ts b/apps/sim/app/api/copilot/chat/queries.ts
index 565b14af083..6834923367d 100644
--- a/apps/sim/app/api/copilot/chat/queries.ts
+++ b/apps/sim/app/api/copilot/chat/queries.ts
@@ -20,6 +20,7 @@ import {
   createInternalServerErrorResponse,
   createUnauthorizedResponse,
 } from '@/lib/mothership/request/http'
+import { presentChatResourceForBrowser } from '@/lib/mothership/resources/presentation'
 import {
   assertActiveWorkspaceAccess,
   isWorkspaceAccessDeniedError,
@@ -49,7 +50,11 @@ function transformChat(chat: {
     effort: chat.effort ?? null,
     ...('conversationId' in chat ? { activeStreamId: chat.conversationId || null } : {}),
     ...('resources' in chat
-      ? { resources: Array.isArray(chat.resources) ? chat.resources : [] }
+      ? {
+          resources: Array.isArray(chat.resources)
+            ? chat.resources.map(presentChatResourceForBrowser)
+            : [],
+        }
       : {}),
     createdAt: chat.createdAt,
     updatedAt: chat.updatedAt,
diff --git a/apps/sim/app/api/copilot/chat/resources/route.ts b/apps/sim/app/api/copilot/chat/resources/route.ts
index 1cb4f71eea8..c05e09cdd80 100644
--- a/apps/sim/app/api/copilot/chat/resources/route.ts
+++ b/apps/sim/app/api/copilot/chat/resources/route.ts
@@ -5,12 +5,13 @@ import {
 } from '@/lib/api/contracts/copilot'
 import {
   defineInternalJsonRoute,
-  internalJsonPresenters,
   internalOrchestrationErrorPolicy,
   internalRateLimits,
   internalSessionAuth,
 } from '@/lib/api/server/routes'
 import { changeChatResources } from '@/lib/mothership/chat/application/change-resources'
+import { presentChatResourceForBrowser } from '@/lib/mothership/resources/presentation'
+import type { MothershipResource } from '@/lib/mothership/resources/types'
 
 const policy = {
   auth: internalSessionAuth,
@@ -20,7 +21,10 @@ const policy = {
   }),
   errorPolicy: internalOrchestrationErrorPolicy,
   useCase: changeChatResources,
-  present: internalJsonPresenters.withSuccess,
+  present: ({ resources }: { resources: MothershipResource[] }) => ({
+    success: true as const,
+    resources: resources.map(presentChatResourceForBrowser),
+  }),
 }
 
 export const POST = defineInternalJsonRoute({
@@ -53,7 +57,14 @@ export const DELETE = defineInternalJsonRoute({
     chatId: body.chatId,
     change: {
       kind: 'remove' as const,
-      resources: [{ type: body.resourceType, id: body.resourceId, workspaceId: body.workspaceId }],
+      resources: [
+        {
+          type: body.resourceType,
+          id: body.resourceId,
+          workspaceId: body.workspaceId,
+          owner: body.owner,
+        },
+      ],
     },
   }),
 })
diff --git a/apps/sim/app/api/mothership/chats/[chatId]/route.ts b/apps/sim/app/api/mothership/chats/[chatId]/route.ts
index 6be0e4ada77..3c5b3339fd6 100644
--- a/apps/sim/app/api/mothership/chats/[chatId]/route.ts
+++ b/apps/sim/app/api/mothership/chats/[chatId]/route.ts
@@ -28,6 +28,7 @@ import {
   createInternalServerErrorResponse,
   createUnauthorizedResponse,
 } from '@/lib/mothership/request/http'
+import { presentChatResourceForBrowser } from '@/lib/mothership/resources/presentation'
 import { captureServerEvent } from '@/lib/posthog/server'
 
 const logger = createLogger('MothershipChatAPI')
@@ -93,7 +94,9 @@ export const GET = withRouteHandler(
           mode: chat.mode,
           messages: effectiveMessages,
           activeStreamId: liveStreamId,
-          resources: Array.isArray(chat.resources) ? chat.resources : [],
+          resources: Array.isArray(chat.resources)
+            ? chat.resources.map(presentChatResourceForBrowser)
+            : [],
           effort: chat.effort,
           createdAt: chat.createdAt,
           updatedAt: chat.updatedAt,
diff --git a/apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx b/apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx
index 059c28598f2..b035c9fbfdf 100644
--- a/apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx
+++ b/apps/sim/app/o/[organizationId]/home/components/composer/composer.test.tsx
@@ -48,6 +48,7 @@ const mocks = vi.hoisted(() => ({
 vi.mock('@/lib/core/config/deployment-shape', () => deploymentShapeMock)
 vi.mock('@/hooks/queries/workspace', () => ({
   useWorkspacesQuery: () => ({ data: mocks.workspaces }),
+  useOrderedWorkspacesQuery: () => ({ data: mocks.workspaces }),
 }))
 vi.mock('@/hooks/queries/skills', () => ({
   useSkills: () => ({ data: [] }),
@@ -234,6 +235,8 @@ async function render(
             dashboards: false,
             'mothership-model-selector': mocks.advanced,
             'mothership-plan-mode': mocks.plan,
+            projects: false,
+            'project-files': false,
           }}
         >
           <Harness />
@@ -311,6 +314,8 @@ it.each([
               dashboards: false,
               'mothership-model-selector': false,
               'mothership-plan-mode': planEnabled,
+              projects: false,
+              'project-files': false,
             }}
           >
             <Harness />
@@ -405,6 +410,8 @@ it('keeps restored queued skills scoped when replacing a draft', async () => {
             dashboards: false,
             'mothership-model-selector': mocks.advanced,
             'mothership-plan-mode': mocks.plan,
+            projects: false,
+            'project-files': false,
           }}
         >
           <Harness />
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..a30befa6973 100644
--- a/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx
+++ b/apps/sim/app/o/[organizationId]/home/organization-home.test.tsx
@@ -1,6 +1,7 @@
 /** @vitest-environment jsdom */
 
 import { act, type ComponentProps, type ReactNode } from 'react'
+import { toast } from '@sim/emcn'
 import { authClientMock, authClientMockFns } from '@sim/testing/mocks/auth-client.mock'
 import {
   createMockDeploymentShape,
@@ -9,7 +10,6 @@ import {
 } from '@sim/testing/mocks/deployment-shape.mock'
 import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
 import { kbConnectorsQueriesMock } from '@sim/testing/mocks/kb-connectors-queries.mock'
-import { nextNavigationMock } from '@sim/testing/mocks/next-navigation.mock'
 import {
   organizationProviderMock,
   organizationProviderMockFns,
@@ -24,6 +24,8 @@ import { useOrganizationChatModeStore } from '@/stores/organization-chat-mode/st
 
 const mocks = vi.hoisted(() => ({
   plan: false,
+  projects: true,
+  projectFiles: true,
   resourcePanel: vi.fn(),
   chat: vi.fn(),
   composer: vi.fn(),
@@ -40,11 +42,21 @@ const mocks = vi.hoisted(() => ({
   activeResource: null as string | null,
 }))
 vi.mock('@/app/workspace/[workspaceId]/providers/feature-flags-provider', () => ({
-  useFeatureFlag: (name: string) => (name === 'mothership-plan-mode' ? mocks.plan : false),
+  useFeatureFlag: (name: string) =>
+    name === 'mothership-plan-mode'
+      ? mocks.plan
+      : name === 'projects'
+        ? mocks.projects
+        : name === 'project-files'
+          ? mocks.projectFiles
+          : false,
 }))
 vi.mock('@/lib/core/config/deployment-shape', () => deploymentShapeMock)
 vi.mock('@/blocks/integration-matcher', () => integrationMatcherMock)
-vi.mock('next/navigation', () => nextNavigationMock)
+vi.mock(
+  'next/navigation',
+  async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock
+)
 vi.mock('@tanstack/react-query', () => reactQueryMock)
 vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-resource-panel', () => ({
   useResourcePanelController: () => ({
@@ -103,6 +115,8 @@ let root: Root
 let container: HTMLDivElement
 beforeEach(() => {
   useMothershipDraftsStore.setState({ drafts: {} })
+  mocks.projects = true
+  mocks.projectFiles = true
   mocks.plan = false
   mocks.activeResource = null
   mockSession.mockReturnValue({ data: { user: { id: 'reader' } } })
@@ -224,3 +238,36 @@ it('isolates saved drafts by user, organization, and conversation', async () =>
   await act(async () => renderHome(<OrganizationHome chatId='chat-a' requestMode='assistant' />))
   expect(composerProps().value).toBe('')
 })
+
+it.each([
+  [false, true],
+  [true, false],
+  [false, false],
+])(
+  'does not look up saved Project references with flags projects=%s, files=%s',
+  async (projects, projectFiles) => {
+    mocks.projects = projects
+    mocks.projectFiles = projectFiles
+    vi.spyOn(toast, 'error').mockReturnValue('lookup-error')
+    const requests: unknown[] = []
+    const resources: unknown[] = []
+    vi.stubGlobal('fetch', async (input: unknown) => {
+      requests.push(input)
+      throw new Error('Project lookup is disabled')
+    })
+    mocks.addResource.mockImplementation((resource: unknown) => resources.push(resource))
+    await act(async () => renderHome(<OrganizationHome chatId='chat-a' />))
+    const selectResource = mocks.renderer.mock.lastCall?.[0].onWorkspaceResourceSelect
+    if (!selectResource) throw new Error('Chat resource selection is unavailable')
+    await act(async () =>
+      selectResource({
+        type: 'file',
+        id: 'file-a',
+        title: 'Saved Project file',
+        owner: { entityType: 'project', entityId: 'project-a' },
+      })
+    )
+    expect(requests).toEqual([])
+    expect(resources).toEqual([])
+  }
+)
diff --git a/apps/sim/app/o/[organizationId]/home/organization-home.tsx b/apps/sim/app/o/[organizationId]/home/organization-home.tsx
index f0dc31e6986..f55eb529fae 100644
--- a/apps/sim/app/o/[organizationId]/home/organization-home.tsx
+++ b/apps/sim/app/o/[organizationId]/home/organization-home.tsx
@@ -7,6 +7,7 @@ import Link from 'next/link'
 import { useQueryStates } from 'nuqs'
 import { requestJson } from '@/lib/api/client/request'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
+import { getProjectContract } from '@/lib/api/contracts/projects'
 import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces'
 import { useSession } from '@/lib/auth/auth-client'
 import { MothershipHandoffStorage } from '@/lib/core/utils/browser-storage'
@@ -47,7 +48,8 @@ import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-
 import { useFileAttachments } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
 import { mentionifyIntegrations } from '@/blocks/integration-matcher'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
-import { getWorkspaceFilesQueryOptions } from '@/hooks/queries/workspace-files'
+import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
+import { getWorkspaceFilesQueryOptions } from '@/hooks/queries/utils/workspace-file-query'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 import { useOrganizationChatModeStore } from '@/stores/organization-chat-mode/store'
 import type { ChatContext } from '@/stores/panel'
@@ -95,6 +97,8 @@ function OrganizationHomeContent({
   const rememberMode = useOrganizationChatModeStore((state) => state.setMode)
   const [selectedMode, setSelectedMode] = useState<ChatRequestMode | null>(null)
   const planEnabled = useFeatureFlag('mothership-plan-mode')
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
   const requestMode =
     selectedMode ??
     (urlSearchLevel && searchAccess.memberScoped && !chatId ? 'assistant' : undefined) ??
@@ -171,11 +175,30 @@ function OrganizationHomeContent({
   ])
   const selectResource = useCallback(
     async (ref: WorkspaceResourceRef) => {
-      if (!ref.workspaceId) {
-        toast.error('This resource has no workspace address.')
-        return
-      }
       try {
+        if (ref.type === 'file' && ref.owner?.entityType === 'project') {
+          if (!projectsEnabled || !projectFilesEnabled) return
+          if (!ref.id) throw new Error('Missing Project file identity')
+          await requestJson(getProjectContract, {
+            params: { id: ref.owner.entityId },
+            query: { organizationId: organization.id },
+          })
+          const result = await queryClient.fetchQuery({
+            ...getProjectFileQueryOptions(ref.owner.entityId, ref.id),
+            staleTime: 0,
+          })
+          addResource({
+            type: 'file',
+            id: result.file.id,
+            title: result.file.name,
+            owner: result.file.owner,
+          })
+          return
+        }
+        if (!ref.workspaceId) {
+          toast.error('This resource has no workspace address.')
+          return
+        }
         const host = await requestJson(getWorkspaceHostContextContract, {
           params: { id: ref.workspaceId },
         })
@@ -197,7 +220,7 @@ function OrganizationHomeContent({
         toast.error(`Couldn't open "${ref.title}". Check your access and try again.`)
       }
     },
-    [queryClient, addResource, organization.id]
+    [queryClient, addResource, organization.id, projectsEnabled, projectFilesEnabled]
   )
   const files = useFileAttachments({
     userId: session?.user?.id,
diff --git a/apps/sim/app/o/[organizationId]/layout.tsx b/apps/sim/app/o/[organizationId]/layout.tsx
index 78e1ace7284..ce9143ed467 100644
--- a/apps/sim/app/o/[organizationId]/layout.tsx
+++ b/apps/sim/app/o/[organizationId]/layout.tsx
@@ -4,10 +4,12 @@ import { redirect } from 'next/navigation'
 import { SettingsNavigationProvider } from '@/components/settings/settings-navigation-provider'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
+import { isFeatureEnabled } from '@/lib/core/config/feature-flags'
 import { isDashboardsEnabled } from '@/lib/dashboards/feature-flag'
 import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/paths'
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
 import { OrganizationAccessDenied } from '@/app/o/[organizationId]/components/organization-access-denied'
@@ -55,7 +57,14 @@ export default async function OrganizationLayout({
   if (!context.mothershipAvailable && !context.searchAccess.memberScoped)
     redirect(WORKSPACE_SETTINGS_PATH)
 
-  const [, modelSelectorEnabled, planModeEnabled, dashboardsEnabled] = await Promise.all([
+  const [
+    ,
+    modelSelectorEnabled,
+    planModeEnabled,
+    dashboardsEnabled,
+    projectsEnabled,
+    projectFilesEnabled,
+  ] = await Promise.all([
     prefetchOrganizationSidebar(
       queryClient,
       organizationId,
@@ -65,6 +74,8 @@ export default async function OrganizationLayout({
     isMothershipModelSelectorEnabled(),
     isPlanModeEnabled(),
     isDashboardsEnabled(organizationId),
+    isFeatureEnabled('projects'),
+    isProjectFileApiEnabled(),
   ])
   const initialSidebarCollapsed = cookieStore.get('sidebar_collapsed')?.value === '1'
 
@@ -72,6 +83,8 @@ export default async function OrganizationLayout({
     <HydrationBoundary state={dehydrate(queryClient)}>
       <FeatureFlagsProvider
         flags={{
+          projects: projectsEnabled,
+          'project-files': projectFilesEnabled,
           dashboards: dashboardsEnabled,
           'mothership-model-selector': modelSelectorEnabled,
           'mothership-plan-mode': planModeEnabled,
diff --git a/apps/sim/app/projects/[projectId]/files/[fileId]/page.tsx b/apps/sim/app/projects/[projectId]/files/[fileId]/page.tsx
new file mode 100644
index 00000000000..e6ece1a9648
--- /dev/null
+++ b/apps/sim/app/projects/[projectId]/files/[fileId]/page.tsx
@@ -0,0 +1,38 @@
+import { notFound, redirect } from 'next/navigation'
+import { internalSessionAuth } from '@/lib/api/server/routes'
+import { getSession } from '@/lib/auth'
+import { asOrchestrationError } from '@/lib/core/orchestration/types'
+import { getProject } from '@/lib/projects/application/use-cases'
+import { getProjectFileMetadata } from '@/lib/projects/files/application'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
+
+interface ProjectFilePageProps {
+  params: Promise<{ projectId: string; fileId: string }>
+}
+
+/** Resolves a durable Project link into an environment the current viewer can access. */
+export default async function ProjectFilePage({ params }: ProjectFilePageProps) {
+  if (!(await isProjectFileApiEnabled())) notFound()
+  const { projectId, fileId } = await params
+  if (!(await getSession())?.user) {
+    const destination = `/projects/${encodeURIComponent(projectId)}/files/${encodeURIComponent(fileId)}`
+    redirect(`/login?callbackUrl=${encodeURIComponent(destination)}`)
+  }
+  const principal = await internalSessionAuth.authenticate()
+  let workspaceId: string | undefined
+  try {
+    const [context] = await Promise.all([
+      getProject.execute({ principal, input: { projectId } }),
+      getProjectFileMetadata.execute({ principal, input: { projectId, fileId } }),
+    ])
+    workspaceId = context.project.environments[0]?.id
+  } catch (error) {
+    const classified = asOrchestrationError(error)
+    if (classified?.code === 'not_found' || classified?.code === 'forbidden') notFound()
+    throw error
+  }
+  if (!workspaceId) notFound()
+  redirect(
+    `/workspace/${encodeURIComponent(workspaceId)}/files/${encodeURIComponent(fileId)}?owner=project&projectId=${encodeURIComponent(projectId)}`
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/components/folders/drag-payload.ts b/apps/sim/app/workspace/[workspaceId]/components/folders/drag-payload.ts
index 227c17308fa..474158d5191 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/folders/drag-payload.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/folders/drag-payload.ts
@@ -1,3 +1,6 @@
+import { isRecordLike } from '@sim/utils/object'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+
 /**
  * The row ids a drag carries, written to and read from `dataTransfer` as JSON under a
  * private MIME type.
@@ -14,22 +17,40 @@
 export function writeRowDragPayload(
   dataTransfer: DataTransfer,
   mime: string,
-  rowIds: string[]
+  rowIds: string[],
+  owner?: EditableFileOwner
 ): void {
-  dataTransfer.setData(mime, JSON.stringify(rowIds))
+  dataTransfer.setData(mime, JSON.stringify(owner ? { owner, rowIds } : rowIds))
   dataTransfer.setData('text/plain', rowIds.join(','))
 }
 
 /**
  * Reads the row ids back, returning `null` when the payload is absent (a foreign drag) or
- * malformed (another writer on the same MIME) rather than throwing mid-drop. Callers fall back
- * to their in-memory source for drags that never round-tripped through `dataTransfer`.
+ * malformed rather than throwing mid-drop. Owner-scoped readers require an exact pair and
+ * must not replace a rejected payload with an in-memory source.
  */
-export function readRowDragPayload(dataTransfer: DataTransfer, mime: string): string[] | null {
+export function readRowDragPayload(
+  dataTransfer: DataTransfer,
+  mime: string,
+  owner?: EditableFileOwner
+): string[] | null {
   const raw = dataTransfer.getData(mime)
   if (!raw) return null
   try {
     const parsed: unknown = JSON.parse(raw)
+    if (owner) {
+      if (
+        !isRecordLike(parsed) ||
+        !isRecordLike(parsed.owner) ||
+        parsed.owner.entityType !== owner.entityType ||
+        parsed.owner.entityId !== owner.entityId ||
+        !Array.isArray(parsed.rowIds) ||
+        !parsed.rowIds.every((id): id is string => typeof id === 'string' && id.length > 0)
+      ) {
+        return null
+      }
+      return parsed.rowIds.length > 0 ? parsed.rowIds : null
+    }
     if (!Array.isArray(parsed)) return null
     const rowIds = parsed.filter(
       (value): value is string => typeof value === 'string' && value.length > 0
diff --git a/apps/sim/app/workspace/[workspaceId]/components/folders/use-drag-teardown.ts b/apps/sim/app/workspace/[workspaceId]/components/folders/use-drag-teardown.ts
index a28ca2057a5..b12ed726b6b 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/folders/use-drag-teardown.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/folders/use-drag-teardown.ts
@@ -47,12 +47,13 @@ export function useDragTeardown(teardown: () => void): void {
       teardownRef.current()
     }
 
-    window.addEventListener('dragover', markDragging)
+    // Folder rows stop propagation after handling their drop target.
+    window.addEventListener('dragover', markDragging, true)
     window.addEventListener('dragend', endDrag)
     window.addEventListener('drop', endDrag)
     window.addEventListener('pointermove', endDrag)
     return () => {
-      window.removeEventListener('dragover', markDragging)
+      window.removeEventListener('dragover', markDragging, true)
       window.removeEventListener('dragend', endDrag)
       window.removeEventListener('drop', endDrag)
       window.removeEventListener('pointermove', endDrag)
diff --git a/apps/sim/app/workspace/[workspaceId]/components/folders/use-folder-row-drag-drop.ts b/apps/sim/app/workspace/[workspaceId]/components/folders/use-folder-row-drag-drop.ts
index 61c981dc349..7031038dff0 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/folders/use-folder-row-drag-drop.ts
+++ b/apps/sim/app/workspace/[workspaceId]/components/folders/use-folder-row-drag-drop.ts
@@ -1,11 +1,16 @@
 'use client'
 
 import { type DragEvent, useCallback, useMemo, useRef, useState } from 'react'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
 import {
   readRowDragPayload,
   writeRowDragPayload,
 } from '@/app/workspace/[workspaceId]/components/folders/drag-payload'
-import { parseFolderedRowId } from '@/app/workspace/[workspaceId]/components/folders/folder-row-id'
+import {
+  folderRowId,
+  parseFolderedRowId,
+  splitFolderedRowIds,
+} from '@/app/workspace/[workspaceId]/components/folders/folder-row-id'
 import { useDragTeardown } from '@/app/workspace/[workspaceId]/components/folders/use-drag-teardown'
 import { useRowDragGhost } from '@/app/workspace/[workspaceId]/components/folders/use-row-drag-ghost'
 import type { SpringOpenOptions } from '@/app/workspace/[workspaceId]/components/folders/use-spring-loaded-folder'
@@ -119,6 +124,7 @@ export interface UseFolderRowDragDropOptions {
    * never mistaken for one of these rows — see {@link writeRowDragPayload}.
    */
   dragMime: string
+  owner?: EditableFileOwner
   /** Drag and drop are edits; a reader gets neither draggable rows nor drop targets. */
   canEdit: boolean
   /** Row currently being renamed inline, which must stay editable rather than draggable. */
@@ -203,6 +209,7 @@ export interface UseFolderRowDragDropOptions {
  */
 export function useFolderRowDragDrop({
   dragMime,
+  owner,
   canEdit,
   editingRowId,
   descendantsByFolderId,
@@ -224,6 +231,8 @@ export function useFolderRowDragDrop({
    * synchronously.
    */
   const draggedRowIdsRef = useRef<string[]>([])
+  const sourceParentsRef = useRef<Map<string, string | null | undefined> | null>(null)
+  sourceParentsRef.current ??= new Map()
 
   const optionsRef = useRef({
     descendantsByFolderId,
@@ -259,6 +268,7 @@ export function useFolderRowDragDrop({
     springNav.end()
     dragGhost.remove()
     draggedRowIdsRef.current = []
+    sourceParentsRef.current?.clear()
     setDraggedRowIds(EMPTY_ROW_IDS)
     setActiveDropTarget(null)
   }, [dragGhost, springNav])
@@ -278,7 +288,16 @@ export function useFolderRowDragDrop({
    */
   const resolveMoveToFolder = useCallback(
     (targetFolderId: string | null, sourceRowIds: string[]): FolderedRowMove | null => {
-      const { descendantsByFolderId, getFolderParentId, getResourceFolderId } = optionsRef.current
+      const options = optionsRef.current
+      const { descendantsByFolderId } = options
+      const getFolderParentId = (id: string) =>
+        options.getFolderParentId(id) !== undefined
+          ? options.getFolderParentId(id)
+          : sourceParentsRef.current?.get(folderRowId(id))
+      const getResourceFolderId = (id: string) =>
+        options.getResourceFolderId(id) !== undefined
+          ? options.getResourceFolderId(id)
+          : sourceParentsRef.current?.get(id)
       const folderIds: string[] = []
       const resourceIds: string[] = []
 
@@ -288,11 +307,11 @@ export function useFolderRowDragDrop({
           if (source.id === targetFolderId) return null
           if (targetFolderId !== null && descendantsByFolderId.get(source.id)?.has(targetFolderId))
             return null
-          if ((getFolderParentId(source.id) ?? null) === targetFolderId) continue
+          if (getFolderParentId(source.id) === targetFolderId) continue
           folderIds.push(source.id)
           continue
         }
-        if ((getResourceFolderId(source.id) ?? null) === targetFolderId) continue
+        if (getResourceFolderId(source.id) === targetFolderId) continue
         resourceIds.push(source.id)
       }
 
@@ -335,22 +354,47 @@ export function useFolderRowDragDrop({
          * Read the selection in display order rather than insertion order, so a shift-range
          * drag carries its rows the way the user sees them.
          */
-        const sourceRowIds = selection?.selectedRowIds.has(rowId)
+        const selectedSourceRowIds = selection?.selectedRowIds.has(rowId)
           ? selection.visibleRowIds.filter((visibleRowId) =>
               selection.selectedRowIds.has(visibleRowId)
             )
           : [rowId]
         if (selection && !selection.selectedRowIds.has(rowId)) selection.replaceSelection([rowId])
 
+        const carried = dropRowsCarriedByDraggedFolders(
+          splitFolderedRowIds(selectedSourceRowIds),
+          optionsRef.current
+        )
+        const keptIds = new Set([...carried.folderIds.map(folderRowId), ...carried.resourceIds])
+        const sourceRowIds = owner
+          ? selectedSourceRowIds.filter((id) => keptIds.has(id))
+          : selectedSourceRowIds
+        if (sourceRowIds.length === 0) {
+          e.preventDefault()
+          endDrag()
+          return
+        }
+        sourceParentsRef.current = new Map(
+          sourceRowIds.map((rowId) => {
+            const parsed = parseFolderedRowId(rowId)
+            return [
+              rowId,
+              parsed.kind === 'folder'
+                ? optionsRef.current.getFolderParentId(parsed.id)
+                : optionsRef.current.getResourceFolderId(parsed.id),
+            ]
+          })
+        )
         draggedRowIdsRef.current = sourceRowIds
         setDraggedRowIds(new Set(sourceRowIds))
 
         e.dataTransfer.effectAllowed = 'move'
-        writeRowDragPayload(e.dataTransfer, dragMime, sourceRowIds)
+        writeRowDragPayload(e.dataTransfer, dragMime, sourceRowIds, owner)
 
         dragGhost.attach(e, optionsRef.current.getRowLabel(sourceRowIds[0]), sourceRowIds.length)
       },
       onDragOver: (e: DragEvent<HTMLDivElement>, rowId) => {
+        if (!canEdit || parseFolderedRowId(rowId).kind !== 'folder') return
         const sourceRowIds = draggedRowIdsRef.current
         const isExternal = optionsRef.current.externalDrop?.matches(e.dataTransfer) ?? false
         if (isExternal) {
@@ -407,6 +451,7 @@ export function useFolderRowDragDrop({
         )
       },
       onDrop: (e: DragEvent<HTMLDivElement>, rowId) => {
+        if (!canEdit) return
         e.preventDefault()
         e.stopPropagation()
 
@@ -426,7 +471,8 @@ export function useFolderRowDragDrop({
         // Prefer the dataTransfer payload over the ref so a drag that started in another
         // mount of this page still resolves to real row ids.
         const sourceRowIds =
-          readRowDragPayload(e.dataTransfer, dragMime) ?? draggedRowIdsRef.current
+          readRowDragPayload(e.dataTransfer, dragMime, owner) ??
+          (owner ? [] : draggedRowIdsRef.current)
         const move =
           target.kind === 'folder' && sourceRowIds.length > 0
             ? resolveMove(rowId, sourceRowIds)
@@ -453,6 +499,7 @@ export function useFolderRowDragDrop({
       breadcrumb: {
         activeIndex: activeDropTarget?.kind === 'crumb' ? activeDropTarget.index : null,
         onDragOver: (e: DragEvent<HTMLElement>, folderId: string | null, index: number) => {
+          if (!canEdit) return
           if (optionsRef.current.externalDrop?.matches(e.dataTransfer)) return
           const sourceRowIds = draggedRowIdsRef.current
           const canDrop =
@@ -479,11 +526,13 @@ export function useFolderRowDragDrop({
           )
         },
         onDrop: (e: DragEvent<HTMLElement>, folderId: string | null) => {
+          if (!canEdit) return
           if (optionsRef.current.externalDrop?.matches(e.dataTransfer)) return
           e.preventDefault()
           e.stopPropagation()
           const sourceRowIds =
-            readRowDragPayload(e.dataTransfer, dragMime) ?? draggedRowIdsRef.current
+            readRowDragPayload(e.dataTransfer, dragMime, owner) ??
+            (owner ? [] : draggedRowIdsRef.current)
           const move = sourceRowIds.length > 0 ? resolveMoveToFolder(folderId, sourceRowIds) : null
           if (move) springNav.markDropHandled()
           endDrag()
@@ -493,6 +542,7 @@ export function useFolderRowDragDrop({
       body: {
         isActive: activeDropTarget?.kind === 'body',
         onDragOver: (e: DragEvent<HTMLDivElement>) => {
+          if (!canEdit) return
           /** Declined: a page-level upload overlay owns the whole region for an OS file drag. */
           if (optionsRef.current.externalDrop?.matches(e.dataTransfer)) return
           const sourceRowIds = draggedRowIdsRef.current
@@ -520,6 +570,7 @@ export function useFolderRowDragDrop({
           setActiveDropTarget((current) => (current?.kind === 'body' ? null : current))
         },
         onDrop: (e: DragEvent<HTMLDivElement>) => {
+          if (!canEdit) return
           if (optionsRef.current.externalDrop?.matches(e.dataTransfer)) return
           /**
            * Read from the ref, not the closure. This config is memoized, and during a drag the
@@ -533,7 +584,8 @@ export function useFolderRowDragDrop({
           e.preventDefault()
           e.stopPropagation()
           const sourceRowIds =
-            readRowDragPayload(e.dataTransfer, dragMime) ?? draggedRowIdsRef.current
+            readRowDragPayload(e.dataTransfer, dragMime, owner) ??
+            (owner ? [] : draggedRowIdsRef.current)
           const move =
             sourceRowIds.length > 0 ? resolveMoveToFolder(targetFolderId, sourceRowIds) : null
           if (move) springNav.markDropHandled()
@@ -547,6 +599,7 @@ export function useFolderRowDragDrop({
       draggedRowIds,
       canEdit,
       dragMime,
+      owner,
       editingRowId,
       resolveMove,
       resolveMoveToFolder,
diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/components/action-bar/action-bar.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/components/action-bar/action-bar.tsx
index 7ded34f10d0..76fdb7ac164 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/resource/components/action-bar/action-bar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/components/resource/components/action-bar/action-bar.tsx
@@ -11,7 +11,7 @@ import {
   Tooltip,
   Trash,
 } from '@sim/emcn'
-import { Download } from '@sim/emcn/icons'
+import { Download, Duplicate } from '@sim/emcn/icons'
 import type { MoveOptionNode } from '@/app/workspace/[workspaceId]/components/folders'
 import { renderMoveOptions } from '@/app/workspace/[workspaceId]/components/folders'
 
@@ -40,6 +40,7 @@ export interface ResourceActionBarProps {
   selectedCount: number
   /** Omit on lists with nothing to download (tables, knowledge bases). */
   onDownload?: () => void
+  onCopy?: () => void
   /** Both `onMove` and `moveOptions` are required for the move menu to appear. */
   onMove?: (optionValue: string) => void
   moveOptions?: MoveOptionNode[]
@@ -71,6 +72,7 @@ export interface ResourceActionBarProps {
 export function ResourceActionBar({
   selectedCount,
   onDownload,
+  onCopy,
   onMove,
   moveOptions,
   onDelete,
@@ -111,6 +113,14 @@ export function ResourceActionBar({
               disabled={actionsDisabled}
             />
           )}
+          {onCopy && (
+            <ActionButton
+              icon={Duplicate}
+              label='Copy to...'
+              onClick={onCopy}
+              disabled={actionsDisabled}
+            />
+          )}
           {onMove && moveOptions && (
             <DropdownMenu>
               <Tooltip.Root>
diff --git a/apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx b/apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx
index 95bf5999af8..f3005d17fa7 100644
--- a/apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx
@@ -87,6 +87,7 @@ export interface ResourceRow {
 }
 
 export interface SelectableConfig {
+  selectAllLabel?: string
   selectedIds: Set<string>
   onSelectRow: (id: string, checked: boolean, shiftKey?: boolean) => void
   onSelectAll: (checked: boolean) => void
@@ -403,7 +404,7 @@ const ResourceTable = memo(function ResourceTable({
                     checked={selectable.isAllSelected}
                     onCheckedChange={handleSelectAll}
                     disabled={selectable.disabled}
-                    aria-label='Select all'
+                    aria-label={selectable.selectAllLabel ?? 'Select all'}
                   />
                 </div>
               )}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/[fileId]/page.tsx b/apps/sim/app/workspace/[workspaceId]/files/[fileId]/page.tsx
index b4808ec50dd..9290d6ae33e 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/[fileId]/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/[fileId]/page.tsx
@@ -2,9 +2,10 @@ import { Suspense } from 'react'
 import { dehydrate, HydrationBoundary } from '@tanstack/react-query'
 import type { Metadata } from 'next'
 import { getSession } from '@/lib/auth'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import FilesFileLoading from '@/app/workspace/[workspaceId]/files/[fileId]/loading'
-import { Files } from '@/app/workspace/[workspaceId]/files/files'
+import { FilesBrowser } from '@/app/workspace/[workspaceId]/files/browser'
 import { prefetchFilesBrowser } from '@/app/workspace/[workspaceId]/files/prefetch'
 
 export const metadata: Metadata = {
@@ -41,7 +42,7 @@ export default async function FilesFilePage({
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
       <Suspense fallback={<FilesFileLoading />}>
-        <Files />
+        <FilesBrowser projectFilesEnabled={await isProjectFileApiEnabled()} />
       </Suspense>
     </HydrationBoundary>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/files/browser.tsx b/apps/sim/app/workspace/[workspaceId]/files/browser.tsx
new file mode 100644
index 00000000000..2ebf08a93e7
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/browser.tsx
@@ -0,0 +1,124 @@
+'use client'
+
+import { TabStrip } from '@sim/emcn'
+import { useParams } from 'next/navigation'
+import { useQueryStates } from 'nuqs'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import {
+  FileNavigationProvider,
+  useFileNavigation,
+} from '@/app/workspace/[workspaceId]/files/components/file-detail'
+import { Files } from '@/app/workspace/[workspaceId]/files/files'
+import FilesLoading from '@/app/workspace/[workspaceId]/files/loading'
+import { ProjectFiles } from '@/app/workspace/[workspaceId]/files/project-files'
+import {
+  fileOwnerParsers,
+  filesFilterParsers,
+  filesFilterUrlKeys,
+  filesParsers,
+  projectFilesScopeParsers,
+} from '@/app/workspace/[workspaceId]/files/search-params'
+import { useWorkspaceProject } from '@/hooks/queries/project-files'
+
+interface FilesBrowserProps {
+  projectFilesEnabled: boolean
+}
+
+export function FilesBrowser({ projectFilesEnabled }: FilesBrowserProps) {
+  const { workspaceId, fileId } = useParams<{ workspaceId: string; fileId?: string }>()
+  const [{ owner, projectId }] = useQueryStates(fileOwnerParsers)
+  const parent = useWorkspaceProject(workspaceId, projectFilesEnabled)
+  const project = parent.data?.project
+
+  if (owner === 'project' && (!projectFilesEnabled || parent.error)) {
+    return (
+      <div role='status' className='p-6 text-small'>
+        Project files are unavailable.
+      </div>
+    )
+  }
+  if (owner === 'project' && !project) return <FilesLoading />
+  if (owner === 'project' && projectId && projectId !== project?.id) {
+    return (
+      <div role='status' className='p-6 text-small'>
+        This Project does not contain this environment.
+      </div>
+    )
+  }
+
+  const fileOwner: EditableFileOwner =
+    owner === 'project' && project
+      ? { entityType: 'project', entityId: project.id }
+      : { entityType: 'workspace', entityId: workspaceId }
+
+  return (
+    <FileNavigationProvider
+      key={`${fileOwner.entityType}:${fileOwner.entityId}:${fileId ?? 'list'}`}
+      owner={fileOwner}
+      fileId={fileId ?? null}
+    >
+      <div className='flex h-full min-h-0 flex-col'>
+        {project && projectFilesEnabled && (
+          <FileOwnerTabs owner={fileOwner} projectId={project.id} workspaceId={workspaceId} />
+        )}
+        <div className='min-h-0 flex-1'>
+          {owner === 'project' && project ? (
+            <ProjectFiles project={project} workspaceId={workspaceId} />
+          ) : (
+            <Files />
+          )}
+        </div>
+      </div>
+    </FileNavigationProvider>
+  )
+}
+
+interface FileOwnerTabsProps {
+  owner: EditableFileOwner
+  projectId: string
+  workspaceId: string
+}
+
+function FileOwnerTabs({ owner, projectId, workspaceId }: FileOwnerTabsProps) {
+  const { navigate } = useFileNavigation({ owner })
+  const { fileId } = useParams<{ fileId?: string }>()
+  const [, setLocation] = useQueryStates({
+    ...fileOwnerParsers,
+    ...filesParsers,
+    ...projectFilesScopeParsers,
+  })
+  const [, setFilters] = useQueryStates(filesFilterParsers, filesFilterUrlKeys)
+  return (
+    <TabStrip
+      variant='underline'
+      tabs={[
+        { id: 'project', title: 'Project', active: owner.entityType === 'project' },
+        { id: 'workspace', title: 'Environment', active: owner.entityType === 'workspace' },
+      ]}
+      onSelect={(next) => {
+        if (next === owner.entityType || (next !== 'project' && next !== 'workspace')) return
+        if (fileId) {
+          navigate(
+            next === 'project'
+              ? `/workspace/${encodeURIComponent(workspaceId)}/files?owner=project&projectId=${encodeURIComponent(projectId)}`
+              : `/workspace/${encodeURIComponent(workspaceId)}/files`
+          )
+          return
+        }
+        void setFilters({ uploadedBy: null })
+        void setLocation(
+          {
+            owner: next,
+            projectId: next === 'project' ? projectId : null,
+            folderId: null,
+            shareFileId: null,
+            historyFileId: null,
+            new: null,
+            scope: null,
+          },
+          { history: 'push' }
+        )
+      }}
+    />
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.test.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.test.tsx
new file mode 100644
index 00000000000..6bd1b60a6e0
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.test.tsx
@@ -0,0 +1,97 @@
+/** @vitest-environment jsdom */
+import { act } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { FileCopyModal } from '@/app/workspace/[workspaceId]/files/components/file-copy-modal'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { workspaceKeys } from '@/hooks/queries/workspace'
+
+vi.mock(
+  'next/navigation',
+  async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock
+)
+
+let client: QueryClient
+let root: Root
+let container: HTMLDivElement
+const requests: string[] = []
+beforeEach(() => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  vi.useFakeTimers()
+  requests.length = 0
+  client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  client.setQueryData(workspaceKeys.list(), { workspaces: [] })
+  vi.stubGlobal('fetch', async (input: string) => {
+    requests.push(input)
+    return Response.json(
+      input.startsWith('/api/projects')
+        ? {
+            projects: [
+              {
+                id: 'project',
+                name: 'Cached Project',
+                organizationId: null,
+                ownerId: 'user',
+                archivedAt: null,
+                createdAt: '2026-10-08T00:00:00Z',
+                updatedAt: '2026-10-08T00:00:00Z',
+                environments: [],
+                capabilities: { administer: true, issues: true },
+              },
+            ],
+            nextCursor: 'next-page',
+          }
+        : { workspaces: [] }
+    )
+  })
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+afterEach(async () => {
+  await act(async () => root.unmount())
+  client.clear()
+  container.remove()
+  vi.useRealTimers()
+})
+async function render(projects: boolean, projectFiles: boolean) {
+  await act(async () =>
+    root.render(
+      <QueryClientProvider client={client}>
+        <FeatureFlagsProvider
+          flags={{
+            projects,
+            'project-files': projectFiles,
+            dashboards: false,
+            'mothership-model-selector': false,
+            'mothership-plan-mode': false,
+          }}
+        >
+          <FileCopyModal
+            source={{
+              owner: { entityType: 'workspace', entityId: 'workspace' },
+              fileIds: ['file'],
+              folderIds: [],
+            }}
+            onClose={() => {}}
+          />
+        </FeatureFlagsProvider>
+      </QueryClientProvider>
+    )
+  )
+}
+
+it.each([
+  [false, true],
+  [true, false],
+  [false, false],
+])('stops Project destination reads after flags become %s/%s', async (projects, projectFiles) => {
+  await render(true, true)
+  await act(async () => vi.advanceTimersByTimeAsync(10))
+  expect(requests.some((url) => url.startsWith('/api/projects'))).toBe(true)
+  requests.length = 0
+  await render(projects, projectFiles)
+  await act(async () => client.invalidateQueries())
+  expect(requests.filter((url) => url.startsWith('/api/projects'))).toEqual([])
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.tsx
new file mode 100644
index 00000000000..c4ab22301b6
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-copy-modal.tsx
@@ -0,0 +1,244 @@
+'use client'
+
+import { type ReactNode, useMemo, useState } from 'react'
+import {
+  Chip,
+  ChipModal,
+  ChipModalBody,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+  ChipSelect,
+  toast,
+} from '@sim/emcn'
+import { Duplicate } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import type { FileCopySource } from '@/lib/api/contracts/file-copy-input'
+import { MAX_WORKSPACE_FILE_BULK_REQUEST_IDS } from '@/lib/workspace-files/limits'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { useCopyFileItems, useFileCopyDestination } from '@/hooks/queries/file-copy'
+import { useProjects } from '@/hooks/queries/projects'
+import { useWorkspacesQuery } from '@/hooks/queries/workspace'
+
+interface FileCopyModalProps {
+  source: FileCopySource
+  onClose: () => void
+}
+
+interface CopyDestination {
+  owner: EditableFileOwner
+  name: string
+}
+
+export function FileCopyModal({ source, onClose }: FileCopyModalProps) {
+  if (
+    source.fileIds.length > MAX_WORKSPACE_FILE_BULK_REQUEST_IDS ||
+    source.folderIds.length > MAX_WORKSPACE_FILE_BULK_REQUEST_IDS
+  ) {
+    return (
+      <ChipModal
+        open
+        onOpenChange={(open) => {
+          if (!open) onClose()
+        }}
+        srTitle='Copy selection too large'
+      >
+        <ChipModalHeader icon={Duplicate} onClose={onClose}>
+          Selection too large
+        </ChipModalHeader>
+        <ChipModalBody>
+          <p>
+            Select up to {MAX_WORKSPACE_FILE_BULK_REQUEST_IDS.toLocaleString()} files and{' '}
+            {MAX_WORKSPACE_FILE_BULK_REQUEST_IDS.toLocaleString()} folders per copy. Reduce your
+            selection and try again.
+          </p>
+        </ChipModalBody>
+        <ChipModalFooter onCancel={onClose} defaultAction='dismiss' />
+      </ChipModal>
+    )
+  }
+  return <FileCopyDestinationPicker source={source} onClose={onClose} />
+}
+
+function FileCopyDestinationPicker({ source, onClose }: FileCopyModalProps) {
+  const workspaces = useWorkspacesQuery()
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const projectDestinationsEnabled = projectsEnabled && projectFilesEnabled
+  const projects = useProjects(undefined, { enabled: projectDestinationsEnabled })
+  const copy = useCopyFileItems()
+  const [selection, setSelection] = useState('')
+  const destinations = useMemo(() => {
+    const result = new Map<string, CopyDestination>()
+    for (const workspace of workspaces.data ?? [])
+      result.set(`workspace:${workspace.id}`, {
+        owner: { entityType: 'workspace', entityId: workspace.id },
+        name: workspace.name,
+      })
+    for (const page of projectDestinationsEnabled ? (projects.data?.pages ?? []) : [])
+      for (const project of page.projects)
+        result.set(`project:${project.id}`, {
+          owner: { entityType: 'project', entityId: project.id },
+          name: project.name,
+        })
+    return result
+  }, [workspaces.data, projects.data, projectDestinationsEnabled])
+  const destination = destinations.get(selection)
+  const groups = ['project', 'workspace'].map((kind) => ({
+    section: kind === 'project' ? 'Projects' : 'Environments',
+    items: [...destinations]
+      .filter(([, item]) => item.owner.entityType === kind)
+      .map(([value, item]) => ({ value, label: item.name })),
+  }))
+  const destinationField = (
+    <ChipModalField
+      type='custom'
+      title='Destination'
+      hint='Copies saved content. The original files stay in their current location.'
+      error={
+        workspaces.isError || (projectDestinationsEnabled && projects.isError)
+          ? 'Could not load all destinations.'
+          : undefined
+      }
+    >
+      <ChipSelect
+        aria-label='Copy destination'
+        groups={groups}
+        value={selection}
+        onChange={setSelection}
+        disabled={copy.isPending}
+        searchable
+        fullWidth
+        placeholder={
+          workspaces.isPending && (!projectDestinationsEnabled || projects.isPending)
+            ? 'Loading...'
+            : projectDestinationsEnabled
+              ? 'Choose a Project or environment'
+              : 'Choose an environment'
+        }
+      />
+      {projectDestinationsEnabled && projects.hasNextPage && (
+        <Chip disabled={projects.isFetchingNextPage} onClick={() => void projects.fetchNextPage()}>
+          {projects.isFetchingNextPage ? 'Loading...' : 'Load more Projects'}
+        </Chip>
+      )}
+    </ChipModalField>
+  )
+
+  if (destination)
+    return (
+      <CopyDestinationForm
+        key={selection}
+        source={source}
+        destination={destination}
+        onClose={onClose}
+        destinationField={destinationField}
+        copy={copy}
+      />
+    )
+  return (
+    <ChipModal
+      open
+      onOpenChange={(open) => {
+        if (!open) onClose()
+      }}
+      srTitle='Copy files'
+    >
+      <ChipModalHeader icon={Duplicate} onClose={onClose}>
+        Copy to
+      </ChipModalHeader>
+      <ChipModalBody>{destinationField}</ChipModalBody>
+      <ChipModalFooter onCancel={onClose} defaultAction='dismiss' />
+    </ChipModal>
+  )
+}
+
+interface CopyDestinationFormProps extends FileCopyModalProps {
+  destination: CopyDestination
+  destinationField: ReactNode
+  copy: ReturnType<typeof useCopyFileItems>
+}
+
+function CopyDestinationForm({
+  source,
+  destination,
+  onClose,
+  destinationField,
+  copy,
+}: CopyDestinationFormProps) {
+  const folders = useFileCopyDestination(destination.owner)
+  const [folderId, setFolderId] = useState('root')
+  const ready = folders.isFetchedAfterMount && !folders.isError && folders.data?.canWrite
+  const folder = folders.data?.folders.find((item) => item.id === folderId)
+  const validFolder = folderId === 'root' || Boolean(folder)
+  const count = source.fileIds.length + source.folderIds.length
+
+  async function submit() {
+    if (!ready || !validFolder || copy.isPending) return
+    try {
+      await copy.mutateAsync({
+        source,
+        destination: { owner: destination.owner, folderId: folder?.id ?? null },
+      })
+      toast.success(`Copied ${count === 1 ? 'item' : `${count} items`} to ${destination.name}`)
+      onClose()
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Failed to copy files'))
+    }
+  }
+
+  return (
+    <ChipModal
+      open
+      onOpenChange={(open) => {
+        if (!open) onClose()
+      }}
+      dismissDisabled={copy.isPending}
+      srTitle='Copy files'
+    >
+      <ChipModalHeader icon={Duplicate} onClose={onClose}>
+        Copy to
+      </ChipModalHeader>
+      <ChipModalBody>
+        {destinationField}
+        <ChipModalField
+          type='custom'
+          title='Folder'
+          error={
+            folders.isError ? getErrorMessage(folders.error, 'Failed to load folders') : undefined
+          }
+          hint={
+            folders.isFetchedAfterMount && !folders.isError && !folders.data?.canWrite
+              ? 'You have read-only access to this destination.'
+              : undefined
+          }
+        >
+          <ChipSelect
+            aria-label='Destination folder'
+            value={folderId}
+            onChange={setFolderId}
+            disabled={!ready || copy.isPending}
+            fullWidth
+            searchable
+            options={[
+              { value: 'root', label: 'Files' },
+              ...(folders.data?.folders ?? []).map((folder) => ({
+                value: folder.id,
+                label: folder.path || folder.name,
+              })),
+            ]}
+          />
+        </ChipModalField>
+      </ChipModalBody>
+      <ChipModalFooter
+        onCancel={onClose}
+        primaryAction={{
+          label: copy.isPending ? 'Copying...' : 'Copy',
+          disabled: !ready || !validFolder || copy.isPending,
+          onClick: () => void submit(),
+        }}
+      />
+    </ChipModal>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/detail.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/detail.tsx
new file mode 100644
index 00000000000..fdf9c59ac54
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/detail.tsx
@@ -0,0 +1,140 @@
+'use client'
+
+import { type ComponentProps, useCallback, useEffect, useState } from 'react'
+import { toast } from '@sim/emcn'
+import { Columns2, Eye, Pencil } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile'
+import type { ResourceAction } from '@/app/workspace/[workspaceId]/components/resource/components/resource-header'
+import { Resource } from '@/app/workspace/[workspaceId]/components/resource/resource'
+import { useFileNavigation } from '@/app/workspace/[workspaceId]/files/components/file-detail/navigation'
+import {
+  FileViewer,
+  isCsvStreamOnly,
+  isMarkdownFile,
+  isPreviewable,
+  isTextEditable,
+  type PreviewMode,
+} from '@/app/workspace/[workspaceId]/files/components/file-viewer'
+import { FileDocAvatars } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-avatars'
+import { FileDocRoomProvider } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-room-context'
+
+interface FileDetailProps {
+  viewer: ComponentProps<typeof FileViewer>
+  header: Omit<ComponentProps<typeof Resource.Header>, 'aside'>
+  showSaveAction?: boolean
+}
+
+/** Shared editor chrome; owner-specific queries and commands remain in their browser adapters. */
+export function FileDetail({ viewer, header, showSaveAction = false }: FileDetailProps) {
+  const owner = viewer.owner ?? { entityType: 'workspace' as const, entityId: viewer.workspaceId }
+  const navigation = useFileNavigation({ owner })
+  const [previewMode, setPreviewMode] = useState<PreviewMode>(() =>
+    !viewer.autoFocus && isPreviewable(viewer.file) ? 'preview' : 'editor'
+  )
+  const { save, setSaveStatus } = navigation
+  const handleSave = useCallback(() => {
+    void save().catch((error) => toast.error(getErrorMessage(error, 'Unable to save this file')))
+  }, [save])
+  const handleSaveStatusChange = useCallback(
+    (status: 'idle' | 'saving' | 'saved' | 'error', retry?: () => Promise<void>) => {
+      setSaveStatus(status)
+      if (status === 'error') {
+        toast.error(`Failed to save "${viewer.file.name}"`, {
+          action: {
+            label: 'Retry',
+            onClick: () =>
+              void retry?.().catch((error) =>
+                toast.error(getErrorMessage(error, 'Unable to save this file'))
+              ),
+          },
+        })
+      }
+    },
+    [setSaveStatus, viewer.file.name]
+  )
+
+  useEffect(() => {
+    function handleKeyDown(event: KeyboardEvent) {
+      if ((event.metaKey || event.ctrlKey) && event.key === 's') {
+        event.preventDefault()
+        handleSave()
+      }
+    }
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [handleSave])
+
+  if (navigation.fileId !== viewer.file.id)
+    throw new Error('File detail does not match its navigation scope')
+
+  const streamOnly = isCsvStreamOnly(viewer.file)
+  const canPreview =
+    isPreviewable(viewer.file) &&
+    !streamOnly &&
+    !isMarkdownFile(viewer.file) &&
+    viewer.file.type !== SIM_PAGE_CONTENT_TYPE
+  const hasSplitView = canPreview && isTextEditable(viewer.file)
+  const actions: ResourceAction[] = [
+    ...(canPreview
+      ? [
+          {
+            text: hasSplitView
+              ? previewMode === 'editor'
+                ? 'Split'
+                : previewMode === 'split'
+                  ? 'Preview'
+                  : 'Edit'
+              : previewMode === 'preview'
+                ? 'Edit'
+                : 'Preview',
+            icon:
+              hasSplitView && previewMode === 'editor'
+                ? Columns2
+                : previewMode === 'preview'
+                  ? Pencil
+                  : Eye,
+            onSelect: () =>
+              setPreviewMode((current) =>
+                hasSplitView
+                  ? current === 'editor'
+                    ? 'split'
+                    : current === 'split'
+                      ? 'preview'
+                      : 'editor'
+                  : current === 'preview'
+                    ? 'editor'
+                    : 'preview'
+              ),
+          },
+        ]
+      : []),
+    ...(showSaveAction && viewer.canEdit && isTextEditable(viewer.file) && !streamOnly
+      ? [
+          {
+            id: 'save',
+            text: 'Save',
+            disabled: !navigation.isDirty || navigation.saveStatus === 'saving',
+            onSelect: handleSave,
+          },
+        ]
+      : []),
+    ...(header.actions ?? []),
+  ]
+  return (
+    <FileDocRoomProvider>
+      <Resource>
+        <Resource.Header {...header} actions={actions} aside={<FileDocAvatars />} />
+        <FileViewer
+          {...viewer}
+          previewMode={previewMode}
+          onDirtyChange={navigation.setIsDirty}
+          onSaveStatusChange={handleSaveStatusChange}
+          saveRef={navigation.saveRef}
+          downloadSourceRef={navigation.downloadSourceRef}
+          discardRef={navigation.discardRef}
+        />
+      </Resource>
+    </FileDocRoomProvider>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/index.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/index.ts
new file mode 100644
index 00000000000..20be81feffa
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/index.ts
@@ -0,0 +1,2 @@
+export { FileDetail } from './detail'
+export { FileNavigationProvider, useFileNavigation } from './navigation'
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/navigation.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/navigation.tsx
new file mode 100644
index 00000000000..b3ce615a395
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-detail/navigation.tsx
@@ -0,0 +1,105 @@
+'use client'
+
+import { createContext, type ReactNode, useCallback, useContext, useRef, useState } from 'react'
+import { useRouter } from 'next/navigation'
+import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard'
+import type { FileDownloadSource } from '@/lib/uploads/client/download'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+
+type SaveStatus = 'idle' | 'saving' | 'saved' | 'error'
+
+interface FileNavigationController {
+  owner: EditableFileOwner
+  fileId: string | null
+  saveRef: React.MutableRefObject<(() => Promise<void>) | null>
+  discardRef: React.MutableRefObject<(() => void) | null>
+  downloadSourceRef: React.MutableRefObject<FileDownloadSource | null>
+  isDirty: boolean
+  saveStatus: SaveStatus
+  setIsDirty: (dirty: boolean) => void
+  setSaveStatus: (status: SaveStatus) => void
+  navigate: (url: string) => void
+  save: () => Promise<void>
+}
+
+const FileNavigationContext = createContext<FileNavigationController | null>(null)
+
+interface FileNavigationProviderProps {
+  owner: EditableFileOwner
+  fileId: string | null
+  children: ReactNode
+}
+
+/** One draft scope surrounds both owner tabs and the current file's detail view. */
+export function FileNavigationProvider({ owner, fileId, children }: FileNavigationProviderProps) {
+  const saveRef = useRef<(() => Promise<void>) | null>(null)
+  const discardRef = useRef<(() => void) | null>(null)
+  const downloadSourceRef = useRef<FileDownloadSource | null>(null)
+  const dirtyRef = useRef(false)
+  const savingRef = useRef<SaveStatus>('idle')
+  const router = useRouter()
+  const [isDirty, updateIsDirty] = useState(false)
+  const [saveStatus, updateSaveStatus] = useState<SaveStatus>('idle')
+  const setIsDirty = useCallback((dirty: boolean) => {
+    dirtyRef.current = dirty
+    updateIsDirty(dirty)
+  }, [])
+  const setSaveStatus = useCallback((status: SaveStatus) => {
+    savingRef.current = status
+    updateSaveStatus(status)
+  }, [])
+  const { guardBack } = useSettingsUnsavedGuard({
+    isDirty,
+    navigationBlocked: saveStatus === 'saving',
+    onDiscard: () => {
+      discardRef.current?.()
+      setIsDirty(false)
+      setSaveStatus('idle')
+    },
+  })
+  const navigate = useCallback(
+    (url: string) => guardBack(() => router.push(url)),
+    [guardBack, router]
+  )
+  const save = useCallback(async () => {
+    if (saveRef.current && dirtyRef.current && savingRef.current !== 'saving') {
+      await saveRef.current()
+    }
+  }, [])
+
+  return (
+    <FileNavigationContext.Provider
+      value={{
+        owner,
+        fileId,
+        saveRef,
+        discardRef,
+        downloadSourceRef,
+        isDirty,
+        saveStatus,
+        setIsDirty,
+        setSaveStatus,
+        navigate,
+        save,
+      }}
+    >
+      {children}
+    </FileNavigationContext.Provider>
+  )
+}
+
+interface UseFileNavigationProps {
+  owner: EditableFileOwner
+}
+
+export function useFileNavigation({ owner }: UseFileNavigationProps) {
+  const controller = useContext(FileNavigationContext)
+  if (
+    !controller ||
+    controller.owner.entityType !== owner.entityType ||
+    controller.owner.entityId !== owner.entityId
+  ) {
+    throw new Error('File navigation requires its explicit owner scope')
+  }
+  return controller
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-extraction-modal.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-extraction-modal.tsx
new file mode 100644
index 00000000000..635ede524d5
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-extraction-modal.tsx
@@ -0,0 +1,43 @@
+import { ChipConfirmModal } from '@sim/emcn'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { useExtractFile } from '@/hooks/queries/file-extraction'
+
+interface FileExtractionModalProps {
+  owner: EditableFileOwner
+  fileId: string
+  fileName: string
+  canWrite: boolean
+  onClose: () => void
+}
+
+export function FileExtractionModal({
+  owner,
+  fileId,
+  fileName,
+  canWrite,
+  onClose,
+}: FileExtractionModalProps) {
+  const extract = useExtractFile(owner)
+  return (
+    <ChipConfirmModal
+      open
+      onOpenChange={(open) => {
+        if (!open && !extract.isPending) onClose()
+      }}
+      title='Unzip archive?'
+      defaultAction='confirm'
+      text={['This will unzip ', { text: fileName, bold: true }, ' into a new folder beside it.']}
+      confirm={{
+        label: 'Unzip',
+        onClick: () => {
+          if (!canWrite || extract.isPending) return
+          extract.mutate({ fileId, fileName }, { onSuccess: onClose })
+        },
+        variant: 'primary',
+        pending: extract.isPending,
+        pendingLabel: 'Unzipping...',
+        disabled: !canWrite,
+      }}
+    />
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-filter-controls.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-filter-controls.tsx
new file mode 100644
index 00000000000..3a22020e1a7
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-filter-controls.tsx
@@ -0,0 +1,106 @@
+'use client'
+
+import { Chip, ChipCombobox, type ComboboxOption } from '@sim/emcn'
+import { FILE_BROWSER_SIZE_OPTIONS, FILE_BROWSER_TYPE_OPTIONS } from '@/lib/workspace-files/browser'
+import {
+  ResourceFilterPanel,
+  ResourceFilterSection,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-options'
+
+interface FileFilterControlsProps {
+  types: string[]
+  sizes: string[]
+  creatorIds: string[]
+  creators: ComboboxOption[]
+  onTypes: (values: string[]) => void
+  onSizes: (values: string[]) => void
+  onCreators: (values: string[]) => void
+  onClear: () => void
+}
+
+export function FileFilterControls({
+  types,
+  sizes,
+  creatorIds,
+  creators,
+  onTypes,
+  onSizes,
+  onCreators,
+  onClear,
+}: FileFilterControlsProps) {
+  const typeLabel =
+    types.length === 0
+      ? 'All'
+      : types.length === 1
+        ? (FILE_BROWSER_TYPE_OPTIONS.find((option) => option.value === types[0])?.label ?? types[0])
+        : `${types.length} selected`
+  const sizeLabel =
+    sizes.length === 0
+      ? 'All'
+      : sizes.length === 1
+        ? (FILE_BROWSER_SIZE_OPTIONS.find((option) => option.value === sizes[0])?.label.split(
+            ' ('
+          )[0] ?? sizes[0])
+        : `${sizes.length} selected`
+  const creatorLabel =
+    creatorIds.length === 0
+      ? 'All'
+      : creatorIds.length === 1
+        ? (creators.find((option) => option.value === creatorIds[0])?.label ?? '1 creator')
+        : `${creatorIds.length} creators`
+  return (
+    <ResourceFilterPanel>
+      <ResourceFilterSection label='File Type'>
+        <ChipCombobox
+          aria-label='File type'
+          options={[...FILE_BROWSER_TYPE_OPTIONS]}
+          multiSelect
+          multiSelectValues={types}
+          onMultiSelectChange={onTypes}
+          overlayLabel={typeLabel}
+          overlayContent={typeLabel}
+          showAllOption
+          allOptionLabel='All'
+          className='w-full'
+        />
+      </ResourceFilterSection>
+      <ResourceFilterSection label='Size'>
+        <ChipCombobox
+          aria-label='File size'
+          options={[...FILE_BROWSER_SIZE_OPTIONS]}
+          multiSelect
+          multiSelectValues={sizes}
+          onMultiSelectChange={onSizes}
+          overlayLabel={sizeLabel}
+          overlayContent={sizeLabel}
+          showAllOption
+          allOptionLabel='All'
+          className='w-full'
+        />
+      </ResourceFilterSection>
+      {creators.length > 0 && (
+        <ResourceFilterSection label='Uploaded By'>
+          <ChipCombobox
+            aria-label='Uploaded by'
+            options={creators}
+            multiSelect
+            multiSelectValues={creatorIds}
+            onMultiSelectChange={onCreators}
+            overlayLabel={creatorLabel}
+            overlayContent={creatorLabel}
+            searchable
+            searchPlaceholder='Search creators...'
+            showAllOption
+            allOptionLabel='All'
+            className='w-full'
+          />
+        </ResourceFilterSection>
+      )}
+      {(types.length > 0 || sizes.length > 0 || creatorIds.length > 0) && (
+        <Chip onClick={onClear} className='w-full'>
+          Clear all filters
+        </Chip>
+      )}
+    </ResourceFilterPanel>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-history-modal.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-history-modal.tsx
new file mode 100644
index 00000000000..2600b848c6a
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-history-modal.tsx
@@ -0,0 +1,222 @@
+'use client'
+
+import { useState } from 'react'
+import {
+  Chip,
+  ChipConfirmModal,
+  ChipModal,
+  ChipModalBody,
+  ChipModalField,
+  ChipModalFooter,
+  ChipModalHeader,
+  cn,
+  OverflowText,
+  scrollFadeAttributes,
+  scrollFadeClass,
+  toast,
+  useScrollEdges,
+} from '@sim/emcn'
+import { Clock, Download, RefreshCw } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import type { V2FileVersion } from '@/lib/api/contracts/v2/file-versions'
+import { saveBlob } from '@/lib/uploads/client/download'
+import { formatFileSize } from '@/lib/uploads/utils/file-utils'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { useFileNavigation } from '@/app/workspace/[workspaceId]/files/components/file-detail'
+import {
+  useDownloadFileVersion,
+  useFileHistory,
+  useRevertFileVersion,
+} from '@/hooks/queries/file-history'
+
+interface FileHistoryModalProps {
+  owner: EditableFileOwner
+  fileId: string
+  fileName: string
+  canWrite: boolean
+  onClose: () => void
+}
+
+export function FileHistoryModal({
+  owner,
+  fileId,
+  fileName,
+  canWrite,
+  onClose,
+}: FileHistoryModalProps) {
+  const history = useFileHistory(owner, fileId, true)
+  const revert = useRevertFileVersion(owner, fileId)
+  const download = useDownloadFileVersion(owner, fileId)
+  const navigation = useFileNavigation({ owner })
+  const [scrollElement, setScrollElement] = useState<HTMLDivElement | null>(null)
+  const [target, setTarget] = useState<{ version: number; expectedRevision: string } | null>(null)
+  const edges = useScrollEdges(scrollElement)
+  const versions = history.data?.pages.flatMap((page) => page.versions) ?? []
+  const revision = history.data?.pages[0]?.revision
+  const hasDraft =
+    navigation.fileId === fileId && (navigation.isDirty || navigation.saveStatus === 'saving')
+  const canRevert =
+    canWrite && history.isFetchedAfterMount && !history.isError && Boolean(revision) && !hasDraft
+
+  async function downloadVersion(version: number) {
+    try {
+      const response = await download.mutateAsync(version)
+      saveBlob(await response.blob(), `v${version}-${fileName}`)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Failed to download version'))
+    }
+  }
+
+  async function confirmRevert() {
+    if (!target || !canRevert) return
+    try {
+      const result = await revert.mutateAsync(target)
+      setTarget(null)
+      toast.success(result.reverted ? 'File reverted' : 'This version is already current')
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Failed to revert file'))
+      setTarget(null)
+    }
+  }
+
+  return (
+    <>
+      <ChipModal
+        open
+        onOpenChange={(open) => {
+          if (!open) onClose()
+        }}
+        size='lg'
+        dismissDisabled={revert.isPending}
+        srTitle={`Version history for ${fileName}`}
+      >
+        <ChipModalHeader icon={Clock} onClose={onClose}>
+          Version History
+        </ChipModalHeader>
+        <ChipModalBody>
+          <ChipModalField
+            type='custom'
+            title={fileName}
+            error={
+              history.isError ? getErrorMessage(history.error, 'Failed to load history') : undefined
+            }
+            hint={hasDraft ? 'Save or discard your changes before reverting.' : undefined}
+          >
+            <div
+              ref={setScrollElement}
+              className={cn('max-h-[420px] overflow-y-auto', scrollFadeClass)}
+              {...scrollFadeAttributes(edges)}
+            >
+              <div className='flex flex-col gap-3 py-1'>
+                {history.isPending && (
+                  <p className='text-[var(--text-muted)] text-caption'>Loading history...</p>
+                )}
+                {!history.isPending && !history.isError && versions.length === 0 && (
+                  <p className='text-[var(--text-muted)] text-caption'>No recorded versions.</p>
+                )}
+                {versions.map((version) => (
+                  <FileHistoryRow
+                    key={version.version}
+                    version={version}
+                    busy={download.isPending || revert.isPending}
+                    canRevert={canRevert}
+                    onDownload={() => void downloadVersion(version.version)}
+                    onRevert={() => {
+                      if (revision)
+                        setTarget({ version: version.version, expectedRevision: revision })
+                    }}
+                  />
+                ))}
+                {history.hasNextPage && (
+                  <Chip
+                    disabled={history.isFetchingNextPage}
+                    onClick={() => void history.fetchNextPage()}
+                  >
+                    {history.isFetchingNextPage ? 'Loading...' : 'Load more'}
+                  </Chip>
+                )}
+              </div>
+            </div>
+          </ChipModalField>
+        </ChipModalBody>
+        <ChipModalFooter
+          onCancel={onClose}
+          cancelLabel='Close'
+          defaultAction='dismiss'
+          secondaryActions={[
+            {
+              label: 'Refresh',
+              leftAdornment: <RefreshCw />,
+              disabled: history.isFetching || revert.isPending,
+              onClick: () => void history.refetch(),
+            },
+          ]}
+        />
+      </ChipModal>
+      <ChipConfirmModal
+        open={target !== null}
+        onOpenChange={(open) => {
+          if (!open) setTarget(null)
+        }}
+        title={`Revert to version ${target?.version ?? ''}?`}
+        text='This writes the selected content as a new version. Your current version remains in history.'
+        confirm={{
+          label: 'Revert',
+          variant: 'primary',
+          pending: revert.isPending,
+          pendingLabel: 'Reverting...',
+          disabled: !canRevert,
+          onClick: () => void confirmRevert(),
+        }}
+      />
+    </>
+  )
+}
+
+interface FileHistoryRowProps {
+  version: V2FileVersion
+  busy: boolean
+  canRevert: boolean
+  onDownload: () => void
+  onRevert: () => void
+}
+
+function FileHistoryRow({ version, busy, canRevert, onDownload, onRevert }: FileHistoryRowProps) {
+  const authors = version.authors
+    .map((author) => author.email ?? `Deleted user (${author.id})`)
+    .join(', ')
+  return (
+    <div className='flex items-center gap-3'>
+      <div className='min-w-0 flex-1'>
+        <p className='text-small'>
+          Version {version.version}
+          {version.isCurrent ? ' · Current' : ''}
+        </p>
+        <OverflowText
+          className='text-[var(--text-muted)] text-caption'
+          label={`${authors || 'System'} · ${version.source} · ${formatFileSize(version.size, { includeBytes: true })}`}
+        />
+        <p className='text-[var(--text-muted)] text-caption'>
+          {new Date(version.updatedAt).toLocaleString()}
+        </p>
+      </div>
+      <Chip
+        leftIcon={Download}
+        disabled={busy}
+        onClick={onDownload}
+        aria-label={`Download version ${version.version}`}
+      >
+        Download
+      </Chip>
+      {!version.isCurrent && canRevert && (
+        <Chip
+          disabled={busy}
+          onClick={onRevert}
+          aria-label={`Revert to version ${version.version}`}
+        >
+          Revert
+        </Chip>
+      )}
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-row-context-menu/file-row-context-menu.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-row-context-menu/file-row-context-menu.tsx
index 64de7862464..f353deb7aba 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-row-context-menu/file-row-context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-row-context-menu/file-row-context-menu.tsx
@@ -15,7 +15,7 @@ import {
   FolderInput,
   Pencil,
 } from '@sim/emcn'
-import { Download, Link, Pin, Send, Trash } from '@sim/emcn/icons'
+import { Clock, Download, Duplicate, Link, Pin, Send, Trash } from '@sim/emcn/icons'
 import type { MoveOptionNode } from '@/app/workspace/[workspaceId]/components/folders'
 import { renderMoveOption } from '@/app/workspace/[workspaceId]/components/folders'
 import { selectionActionLabel } from '@/app/workspace/[workspaceId]/components/resource/selection-label'
@@ -27,11 +27,13 @@ interface FileRowContextMenuProps {
   onOpen: () => void
   onCopyLink?: () => void
   onDownload?: () => void
+  onHistory?: () => void
+  onCopy?: () => void
   onRename: () => void
   onDelete: () => void
   onMove?: (optionValue: string) => void
   onShare?: () => void
-  onTogglePin: () => void
+  onTogglePin?: () => void
   /** Pin state of the right-clicked row, driving the Pin/Unpin label. */
   pinned: boolean
   moveOptions?: MoveOptionNode[]
@@ -46,6 +48,8 @@ export const FileRowContextMenu = memo(function FileRowContextMenu({
   onOpen,
   onCopyLink,
   onDownload,
+  onHistory,
+  onCopy,
   onRename,
   onDelete,
   onMove,
@@ -66,7 +70,10 @@ export const FileRowContextMenu = memo(function FileRowContextMenu({
    * @see `.claude/rules/sim-list-ordering.md` — one rule, before the destructive group.
    */
   const hasActionsAboveDestructive =
-    !isMultiSelect || !!onDownload || (!!onMove && !!moveOptions && moveOptions.length > 0)
+    !isMultiSelect ||
+    !!onDownload ||
+    !!onCopy ||
+    (!!onMove && !!moveOptions && moveOptions.length > 0)
 
   return (
     <DropdownMenu open={isOpen} onOpenChange={(open) => !open && onClose()} modal={false}>
@@ -102,7 +109,19 @@ export const FileRowContextMenu = memo(function FileRowContextMenu({
             {selectionActionLabel('Download', selectedCount)}
           </DropdownMenuItem>
         )}
-        {!isMultiSelect && (
+        {!isMultiSelect && onHistory && (
+          <DropdownMenuItem onSelect={onHistory}>
+            <Clock />
+            Version History
+          </DropdownMenuItem>
+        )}
+        {onCopy && (
+          <DropdownMenuItem onSelect={onCopy}>
+            <Duplicate />
+            {selectionActionLabel('Copy', selectedCount, 'Copy to...')}
+          </DropdownMenuItem>
+        )}
+        {!isMultiSelect && onTogglePin && (
           <DropdownMenuItem onSelect={onTogglePin}>
             <Pin />
             {pinned ? 'Unpin' : 'Pin'}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-upload-overlay.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-upload-overlay.tsx
new file mode 100644
index 00000000000..c8c746e51d1
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-upload-overlay.tsx
@@ -0,0 +1,19 @@
+import { Upload } from '@sim/emcn/icons'
+
+interface FileUploadOverlayProps {
+  destination: string
+}
+
+export function FileUploadOverlay({ destination }: FileUploadOverlayProps) {
+  return (
+    <div className='pointer-events-none absolute inset-0 z-[var(--z-dropdown)] flex flex-col items-center justify-center gap-2 border border-[var(--brand-secondary)] border-dashed bg-[var(--white)] transition-colors dark:bg-[var(--surface-4)]'>
+      <Upload className='size-5 text-[var(--brand-secondary)]' />
+      <div className='flex flex-col gap-0.5 text-center'>
+        <p className='text-[var(--brand-secondary)] text-sm'>Drop to upload</p>
+        <p className='text-[var(--text-tertiary)] text-xs'>
+          Release files here to add them to {destination}
+        </p>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/chart-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/chart-preview.tsx
index fcc727388a5..90c1c57e364 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/chart-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/chart-preview.tsx
@@ -20,7 +20,7 @@ const CHART_HEADER_HEIGHT = 24
 
 interface ChartPreviewProps {
   content: string
-  workspaceId: string
+  workspaceId: string | undefined
   isStreaming?: boolean
 }
 
@@ -50,6 +50,7 @@ export function ChartPreview({ content, workspaceId, isStreaming = false }: Char
   if (parseError && isStreaming) return <PreviewLoadingFrame className='h-full flex-1' />
   const error =
     parseError ??
+    (tableSource && !workspaceId ? 'Table-backed charts require a workspace.' : null) ??
     (tableSource && (rowsQuery.isError || tableQuery.isError)
       ? getErrorMessage(rowsQuery.error ?? tableQuery.error, 'Failed to read table')
       : null)
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-import.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-import.ts
index efd99ab7b40..be23c974d59 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-import.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-import.ts
@@ -11,12 +11,10 @@ import { useImportTrayStore } from '@/stores/table/import-tray/store'
 export type CsvImportFileDescriptor = Pick<WorkspaceFileRecord, 'id' | 'key' | 'name'>
 
 /**
- * Wires the "Import as a table" affordance for a capped CSV preview. When the preview is
- * `truncated`, raises a one-time warning toast whose action kicks off a background import of the
- * existing workspace file — no re-upload, source preserved — and navigates to the new table.
+ * Warns when a CSV preview is capped. Editable workspace files also offer a background table import.
  */
 export function useCsvTruncationImport(
-  workspaceId: string,
+  workspaceId: string | undefined,
   file: CsvImportFileDescriptor,
   truncated: boolean,
   readOnly = false
@@ -29,7 +27,7 @@ export function useCsvTruncationImport(
   const importingRef = useRef(false)
 
   const importAsTable = useCallback(() => {
-    if (importingRef.current) return
+    if (!workspaceId || importingRef.current) return
     importingRef.current = true
     let importId: string | null = null
     toast.success(`Importing "${file.name}" as a table`, {
@@ -64,14 +62,18 @@ export function useCsvTruncationImport(
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [workspaceId, file.id, file.key, file.name])
 
-  // Surface the cap as a warning toast with an import action, once per file.
   const notifiedKeyRef = useRef<string | null>(null)
   useEffect(() => {
-    if (readOnly || !truncated || notifiedKeyRef.current === file.key) return
+    if (!truncated || notifiedKeyRef.current === file.key) return
     notifiedKeyRef.current = file.key
-    toast.warning(`Showing the first ${CSV_PREVIEW_MAX_ROWS.toLocaleString()} rows`, {
-      description: 'Import this file as a table to view all of its rows.',
-      action: { label: 'Import as a table', onClick: importAsTable },
-    })
-  }, [readOnly, truncated, file.key, importAsTable])
+    toast.warning(
+      `Showing the first ${CSV_PREVIEW_MAX_ROWS.toLocaleString()} rows`,
+      workspaceId && !readOnly
+        ? {
+            description: 'Import this file as a table to view all of its rows.',
+            action: { label: 'Import as a table', onClick: importAsTable },
+          }
+        : { description: 'This preview does not include all rows.' }
+    )
+  }, [workspaceId, readOnly, truncated, file.key, importAsTable])
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-table-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-table-preview.tsx
index ecdd766ee21..f7b3335b087 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-table-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/csv-table-preview.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { memo } from 'react'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useHorizontalWheelScroll } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-horizontal-wheel-scroll'
 import { useWorkspaceCsvPreview } from '@/hooks/queries/workspace-file-table'
 import { useCsvTruncationImport } from './csv-import'
@@ -17,8 +17,8 @@ export const CsvTablePreview = memo(function CsvTablePreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
   const scrollRef = useHorizontalWheelScroll()
   const version = Number(new Date(file.updatedAt)) || file.size
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/docx-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/docx-preview.tsx
index ddf44547039..568c98b3239 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/docx-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/docx-preview.tsx
@@ -6,7 +6,7 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { sanitizeRenderedHyperlinks, stripEmbeddedFrames } from '@/lib/core/security/url-safety'
 import { assertOoxmlPreviewWithinLimits } from '@/lib/file-parsers/ooxml-preview-guard'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { PREVIEW_LOADING_OVERLAY, PreviewError, resolvePreviewError } from './preview-shared'
 import { PreviewToolbar } from './preview-toolbar'
 import { useDocPreviewBinary } from './use-doc-preview-binary'
@@ -67,13 +67,13 @@ export const DocxPreview = memo(function DocxPreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
   const containerRef = useRef<HTMLDivElement>(null)
   const scrollContainerRef = useRef<HTMLDivElement>(null)
   const zoomPercentRef = useRef(100)
-  const preview = useDocPreviewBinary(workspaceId, file)
+  const preview = useDocPreviewBinary({ workspaceId, file })
   const fileData = preview.data
   const [renderError, setRenderError] = useState<string | null>(null)
   const [rendering, setRendering] = useState(false)
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 b1106cbf4cd..f69cb621006 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
@@ -1,8 +1,9 @@
 'use client'
 
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { type ComponentType, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Music } from '@sim/emcn/icons'
 import dynamic from 'next/dynamic'
+import type { ProjectFileRecord } from '@/lib/api/contracts/project-files'
 import type { FileDownloadSource } from '@/lib/uploads/client/download'
 import {
   MAX_TEXT_PREVIEW_BYTES,
@@ -10,13 +11,19 @@ import {
 } from '@/lib/uploads/client/text-content'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { resolveMediaMimeType } from '@/lib/uploads/utils/file-utils'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { FileOwner } from '@/lib/workspace-files/ownership'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import {
   useWorkspaceFileBinary,
   useWorkspaceFileContent,
   useWorkspaceImageDimensionsAdapter,
 } from '@/hooks/queries/workspace-files'
 import {
-  createWorkspaceFileContentSource,
+  createOwnedFileContentSource,
   type FileContentSource,
   FileContentSourceProvider,
 } from '@/hooks/use-file-content-source'
@@ -97,9 +104,7 @@ export function isCsvStreamOnly(file: {
 
 export type PreviewMode = 'editor' | 'split' | 'preview'
 
-interface FileViewerProps {
-  file: WorkspaceFileRecord
-  workspaceId: string
+interface FileViewerOptions {
   /**
    * Content source for this view. Defaults to a workspace-scoped source derived from `workspaceId`;
    * the public share page passes a token-scoped source. Provided to descendants (renderers, embedded
@@ -149,19 +154,65 @@ interface FileViewerProps {
   enableFind?: boolean
 }
 
+type FileViewerProps = FileViewerOptions &
+  (
+    | { file: WorkspaceFileRecord; workspaceId: string; owner?: never }
+    | {
+        file: ProjectFileRecord
+        owner: { entityType: 'project'; entityId: string }
+        workspaceId?: never
+      }
+  )
+
+interface FileViewerContentProps extends FileViewerOptions {
+  file: ViewerFileRecord
+  workspaceId?: string
+}
+
+interface OwnedFileViewerProps extends FileViewerContentProps {
+  owner: FileOwner
+}
+
+const FILE_VIEWER_ADAPTERS: FileOwnerAdapters<ComponentType<OwnedFileViewerProps>> = {
+  workspace: WorkspaceFileViewer,
+  project: OwnedFileViewer,
+}
+
 export function FileViewer(props: FileViewerProps) {
-  const { contentSource, workspaceId } = props
-  // A caller-supplied contentSource means the adapter is unused (and its `workspaceId` may be a share token).
-  const imageDimensions = useWorkspaceImageDimensionsAdapter(workspaceId, {
+  const owner = props.owner ?? { entityType: 'workspace' as const, entityId: props.workspaceId }
+  const Viewer = requireFileOwnerAdapter(FILE_VIEWER_ADAPTERS, owner)
+  return <Viewer {...props} owner={owner} />
+}
+
+function OwnedFileViewer(props: OwnedFileViewerProps) {
+  const { contentSource, owner, file } = props
+  const { entityType, entityId } = owner
+  const source = useMemo(
+    () => contentSource ?? createOwnedFileContentSource({ entityType, entityId }, file.id),
+    [contentSource, entityType, entityId, file.id]
+  )
+  return (
+    <FileContentSourceProvider value={source}>
+      <FileViewerContent {...props} />
+    </FileContentSourceProvider>
+  )
+}
+
+function WorkspaceFileViewer(props: OwnedFileViewerProps) {
+  const { contentSource, owner, file } = props
+  const { entityType, entityId } = owner
+  const imageDimensions = useWorkspaceImageDimensionsAdapter(entityId, {
     enabled: !contentSource,
   })
   const source = useMemo(
-    () => contentSource ?? createWorkspaceFileContentSource(workspaceId, imageDimensions),
-    [contentSource, workspaceId, imageDimensions]
+    () =>
+      contentSource ??
+      createOwnedFileContentSource({ entityType, entityId }, file.id, { imageDimensions }),
+    [contentSource, entityType, entityId, file.id, imageDimensions]
   )
   return (
     <FileContentSourceProvider value={source}>
-      <FileViewerContent {...props} />
+      <FileViewerContent {...props} workspaceId={owner.entityId} />
     </FileContentSourceProvider>
   )
 }
@@ -187,7 +238,7 @@ function FileViewerContent({
   collaborative,
   onDeriveTitleFromHeading,
   enableFind = false,
-}: FileViewerProps) {
+}: FileViewerContentProps) {
   const category = resolveFileCategory(file.type, file.name)
 
   if (category === 'text-editable') {
@@ -304,8 +355,8 @@ const ReadOnlyTextPreview = memo(function ReadOnlyTextPreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
   const {
     data: content,
@@ -347,10 +398,10 @@ const IframePreview = memo(function IframePreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
-  const preview = useDocPreviewBinary(workspaceId, file)
+  const preview = useDocPreviewBinary({ workspaceId, file })
 
   const bufferSource = useMemo<PdfDocumentSource | null>(
     () => (preview.data ? { kind: 'buffer', buffer: preview.data } : null),
@@ -371,7 +422,13 @@ const IframePreview = memo(function IframePreview({
   )
 })
 
-function useBlobUrl(workspaceId: string, fileId: string, fileKey: string) {
+interface UseBlobUrlProps {
+  workspaceId: string | undefined
+  fileId: string
+  fileKey: string
+}
+
+function useBlobUrl({ workspaceId, fileId, fileKey }: UseBlobUrlProps) {
   const { data: fileData, isLoading, error } = useWorkspaceFileBinary(workspaceId, fileId, fileKey)
   const [blobUrl, setBlobUrl] = useState<string | null>(null)
   const blobUrlRef = useRef<string | null>(null)
@@ -405,8 +462,8 @@ const MediaPreview = memo(function MediaPreview({
   workspaceId,
   kind,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
   kind: 'audio' | 'video'
 }) {
   const {
@@ -415,7 +472,7 @@ const MediaPreview = memo(function MediaPreview({
     error: fetchError,
     blobUrl,
     replaceBlobUrl,
-  } = useBlobUrl(workspaceId, file.id, file.key)
+  } = useBlobUrl({ workspaceId, fileId: file.id, fileKey: file.key })
 
   const mediaType = resolveMediaMimeType(file.type, file.name, kind)
 
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/image-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/image-preview.tsx
index f7164b0a2e9..863c25abd8d 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/image-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/image-preview.tsx
@@ -1,12 +1,12 @@
 'use client'
 
 import { memo, useState } from 'react'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useFileContentSource } from '@/hooks/use-file-content-source'
 import { PREVIEW_LOADING_OVERLAY, UnsupportedPreview } from './preview-shared'
 import { ZoomablePreview } from './zoomable-preview'
 
-export const ImagePreview = memo(function ImagePreview({ file }: { file: WorkspaceFileRecord }) {
+export const ImagePreview = memo(function ImagePreview({ file }: { file: ViewerFileRecord }) {
   const source = useFileContentSource()
   /** `v` busts the browser cache across content writes; `preview` lets the server
    *  substitute a renderable JPEG for a HEIC. */
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/pptx-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/pptx-preview.tsx
index 51702331a5f..0822e0b033c 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/pptx-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/pptx-preview.tsx
@@ -2,7 +2,6 @@
 
 import { memo, useEffect, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { PptxSandboxHost } from '@/app/workspace/[workspaceId]/files/components/file-viewer/pptx-sandbox-host'
 import {
   PREVIEW_LOADING_OVERLAY,
@@ -10,6 +9,7 @@ import {
   PreviewLoadingFrame,
   resolvePreviewError,
 } from '@/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useDocPreviewBinary } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-doc-preview-binary'
 
 const logger = createLogger('PptxPreview')
@@ -22,10 +22,10 @@ export const PptxPreview = memo(function PptxPreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
-  const preview = useDocPreviewBinary(workspaceId, file)
+  const preview = useDocPreviewBinary({ workspaceId, file })
   const fileData = preview.data
   const cacheKey = pptxCacheKey(file.id, preview.dataUpdatedAt, fileData?.byteLength ?? 0)
 
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..6c987949ec4 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
@@ -16,6 +16,7 @@ import {
 import { compileSimPage, isSimPageSource } from '@/lib/workspace-files/page-compile'
 import { useHorizontalWheelScroll } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-horizontal-wheel-scroll'
 import { useWorkspaceFileBinary } from '@/hooks/queries/workspace-files'
+import { useFileContentSource } from '@/hooks/use-file-content-source'
 import { ChartPreview } from './chart-preview'
 import { type CsvImportFileDescriptor, useCsvTruncationImport } from './csv-import'
 import { DataTable } from './data-table'
@@ -61,7 +62,7 @@ interface PreviewPanelProps {
   content: string
   mimeType: string | null
   filename: string
-  workspaceId: string
+  workspaceId: string | undefined
   fileId: string
   fileKey: string
   isStreaming?: boolean
@@ -160,7 +161,7 @@ const HTML_PREVIEW_BOOTSTRAP = `<script>
       // The sandbox can neither navigate nor open windows, so hand the click
       // to the host: workspace routes go through the app router, external
       // http(s) links open a new tab.
-      if (href.startsWith('/workspace/') || /^https?:\\/\\//i.test(href)) {
+      if ((href.startsWith('/workspace/') || href.startsWith('/projects/')) || /^https?:\\/\\//i.test(href)) {
         parent.postMessage({ __simPageNav: href }, '*')
       }
     },
@@ -190,14 +191,15 @@ function stampTheme(html: string, theme: 'dark' | 'light'): string {
 export function buildHtmlPreviewDocument(
   content: string,
   theme: 'dark' | 'light' = 'light',
-  workspaceId?: string
+  workspaceId?: string,
+  projectId?: string
 ): string {
   // The pdf model: a page file STORES its source (frontmatter + markdown +
   // sim: fences) and every rendering surface compiles on demand. Partial
   // source mid-stream compiles too, so the page builds up live as the agent
   // appends. Raw HTML (bespoke and legacy stored-compiled pages) skips this.
   if (isSimPageSource(content)) {
-    content = compileSimPage(content, { workspaceId })
+    content = compileSimPage(content, { workspaceId, projectId })
   } else if (content.trimStart().startsWith('---')) {
     // Page source that does not compile yet — frontmatter still streaming in,
     // or a malformed header. Never show a reader raw source: hold the empty
@@ -279,7 +281,11 @@ function useInlinedWorkspaceImages(content: string): string {
   useEffect(() => {
     const cache = cacheRef.current
     if (!cache) return
-    const urls = [...content.matchAll(/src="(\/api\/files\/view\/[^"]+)"/g)].map((m) => m[1])
+    const urls = [
+      ...content.matchAll(
+        /src="(\/api\/(?:files\/view\/[^"?#]+|projects\/[^/"?#]+\/files\/[^/"?#]+\/content)(?:\?[^"#]*)?)(#[^"]*)?"/g
+      ),
+    ].map((m) => m[1])
     const missing = [...new Set(urls)].filter((url) => !cache.has(url))
     if (missing.length === 0) return
     let cancelled = false
@@ -315,10 +321,13 @@ function useInlinedWorkspaceImages(content: string): string {
   }, [content])
   return useMemo(
     () =>
-      content.replace(/src="(\/api\/files\/view\/[^"]+)"/g, (match, url: string) => {
-        const blobUrl = cacheRef.current?.get(url) ?? resolved[url]
-        return blobUrl ? `src="${blobUrl}"` : match
-      }),
+      content.replace(
+        /src="(\/api\/(?:files\/view\/[^"?#]+|projects\/[^/"?#]+\/files\/[^/"?#]+\/content)(?:\?[^"#]*)?)(#[^"]*)?"/g,
+        (match, url: string, fragment: string | undefined) => {
+          const blobUrl = cacheRef.current?.get(url) ?? resolved[url]
+          return blobUrl ? `src="${blobUrl}${fragment ?? ''}"` : match
+        }
+      ),
     [content, resolved]
   )
 }
@@ -345,9 +354,12 @@ const HtmlPreview = memo(function HtmlPreview({
   // runtime, and reopening/refocusing refetches, so the page recompiles on
   // reload. While it loads — and always while streaming/editing — the client
   // compile below stands in, with chart figures as placeholders.
+  const source = useFileContentSource()
   const isSavedPage =
-    Boolean(fileId && fileKey && workspaceId) && isStreaming !== true && isSimPageSource(content)
-  const served = useWorkspaceFileBinary(workspaceId ?? '', fileId ?? '', fileKey ?? '', {
+    Boolean(fileId && fileKey && (workspaceId || source.owner)) &&
+    isStreaming !== true &&
+    isSimPageSource(content)
+  const served = useWorkspaceFileBinary(workspaceId, fileId ?? '', fileKey ?? '', {
     enabled: isSavedPage,
   })
   const servedHtml = useMemo(
@@ -357,7 +369,8 @@ const HtmlPreview = memo(function HtmlPreview({
   const builtContent = buildHtmlPreviewDocument(
     servedHtml ?? batchedContent,
     resolvedTheme === 'dark' ? 'dark' : 'light',
-    workspaceId
+    source.owner?.entityType === 'project' ? undefined : workspaceId,
+    source.owner?.entityType === 'project' ? source.owner.entityId : undefined
   )
   // AFTER the build: workspace image srcs (/api/files/view/…) only exist in
   // the COMPILED document — the raw source says sim:file/… — so substituting
@@ -371,7 +384,7 @@ const HtmlPreview = memo(function HtmlPreview({
     const onMessage = (event: MessageEvent) => {
       const href = (event.data as { __simPageNav?: unknown } | null)?.__simPageNav
       if (typeof href !== 'string') return
-      if (href.startsWith('/workspace/')) {
+      if (href.startsWith('/workspace/') || href.startsWith('/projects/')) {
         router.push(href)
       } else if (/^https?:\/\//i.test(href)) {
         // The server-compiled document absolutizes workspace links (so a
@@ -379,7 +392,10 @@ const HtmlPreview = memo(function HtmlPreview({
         // in-app rather than spawning a new tab of the whole app.
         try {
           const url = new URL(href)
-          if (url.origin === window.location.origin && url.pathname.startsWith('/workspace/')) {
+          if (
+            url.origin === window.location.origin &&
+            (url.pathname.startsWith('/workspace/') || url.pathname.startsWith('/projects/'))
+          ) {
             router.push(`${url.pathname}${url.search}${url.hash}`)
             return
           }
@@ -508,7 +524,7 @@ const CsvPreview = memo(function CsvPreview({
   readOnly,
 }: {
   content: string
-  workspaceId: string
+  workspaceId: string | undefined
   file: CsvImportFileDescriptor
   readOnly?: boolean
 }) {
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/use-file-doc-collaboration.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/use-file-doc-collaboration.ts
index 5dfb35cf237..7bdf1559b77 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/use-file-doc-collaboration.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/use-file-doc-collaboration.ts
@@ -2,12 +2,14 @@
 
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { FILE_DOC_EVENTS, type FileDocPresence } from '@sim/realtime-protocol/file-doc'
+import { useQueryClient } from '@tanstack/react-query'
 import { Awareness } from 'y-protocols/awareness'
 import * as Y from 'yjs'
 import { getUserColor } from '@/lib/workspaces/colors'
 import { FileDocProvider } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-provider'
 import { useReportFileDocOthers } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-room-context'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
+import { resolveFileQueryOwner } from '@/hooks/queries/utils/file-owner-query-adapters'
 
 /** The live collaboration binding the editor wires into TipTap's Collaboration
  * (the {@link Y.Doc}) and CollaborationCaret (the awareness). */
@@ -22,6 +24,7 @@ export interface FileDocCollaboration {
    * provider is consumed for its readiness signal (`synced`) and fatal `join-error`.
    */
   provider: FileDocProvider | null
+  canWrite: boolean
   /**
    * The local caret identity published to awareness: `name`/`color` for CollaborationCaret,
    * and `clientId` so the caret activity extension can tag each caret node (see
@@ -32,7 +35,8 @@ export interface FileDocCollaboration {
 }
 
 interface UseFileDocCollaborationParams {
-  workspaceId: string
+  workspaceId?: string
+  projectId?: string
   fileId: string
   userId: string
   userName: string
@@ -53,12 +57,14 @@ interface UseFileDocCollaborationParams {
  */
 export function useFileDocCollaboration({
   workspaceId,
+  projectId,
   fileId,
   userId,
   userName,
   enabled,
 }: UseFileDocCollaborationParams): FileDocCollaboration | null {
   const { socket } = useSocket()
+  const queryClient = useQueryClient()
 
   // The Y.Doc + Awareness are the editor's authoritative binding — created once
   // and stable for the hook's life (see sim-react-performance: lazy-init ref).
@@ -97,23 +103,42 @@ export function useFileDocCollaboration({
   }, [])
 
   const [provider, setProvider] = useState<FileDocProvider | null>(null)
+  const [canWrite, setCanWrite] = useState(!projectId)
 
   useEffect(() => {
-    if (!enabled || !socket) return
+    if (!enabled || !socket || (!projectId && !workspaceId)) return
     // Non-null: both refs are set during render before any effect runs, and are never destroyed
     // (see above), so this always binds the same doc/awareness the editor froze at mount.
     const doc = docRef.current as Y.Doc
     const awareness = awarenessRef.current as Awareness
-    const fileProvider = new FileDocProvider(socket, fileId, doc, awareness, {
-      owner: { entityType: 'workspace', entityId: workspaceId },
-      userId,
-    })
+    const scope = projectId
+      ? { owner: { entityType: 'project' as const, entityId: projectId }, userId }
+      : workspaceId
+        ? { owner: { entityType: 'workspace' as const, entityId: workspaceId }, userId }
+        : undefined
+    if (!scope) return
+    const fileProvider = new FileDocProvider(socket, fileId, doc, awareness, scope)
+    setCanWrite(fileProvider.canWrite)
+    const reloadAfterWriteLoss = async () => {
+      const target = resolveFileQueryOwner(
+        projectId ? { entityType: 'project', entityId: projectId } : undefined,
+        workspaceId
+      )
+      if (!target) return
+      const filters = target.adapter.invalidationFilters(target.id, fileId)
+      await Promise.all(filters.map((filter) => queryClient.cancelQueries(filter)))
+      await Promise.all(filters.map((filter) => queryClient.resetQueries(filter)))
+    }
+    fileProvider.on('permission', setCanWrite)
+    fileProvider.on('write-access-lost', reloadAfterWriteLoss)
     setProvider(fileProvider)
     return () => {
+      fileProvider.off('permission', setCanWrite)
+      fileProvider.off('write-access-lost', reloadAfterWriteLoss)
       fileProvider.destroy()
       setProvider(null)
     }
-  }, [enabled, socket, fileId, workspaceId, userId])
+  }, [enabled, socket, fileId, workspaceId, projectId, userId, queryClient])
 
   const reportOthers = useReportFileDocOthers()
   const reportOthersRef = useRef(reportOthers)
@@ -172,9 +197,10 @@ export function useFileDocCollaboration({
             doc: docRef.current as Y.Doc,
             awareness: awarenessRef.current as Awareness,
             provider,
+            canWrite,
             user,
           }
         : null,
-    [enabled, provider, user]
+    [enabled, provider, canWrite, user]
   )
 }
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 95d66c457af..36b7b052ffe 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
@@ -6,6 +6,7 @@ import { FILE_DOC_SEED, type JoinFileDocError } from '@sim/realtime-protocol/fil
 import { authClientMock } from '@sim/testing/mocks/auth-client.mock'
 import { nextNavigationMockFns } from '@sim/testing/mocks/next-navigation.mock'
 import { PASTE_LIMITS } from '@sim/utils/paste'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { type Editor, Extension } from '@tiptap/core'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -24,9 +25,11 @@ import { LoadedRichMarkdownEditor } from '@/app/workspace/[workspaceId]/files/co
 
 nextNavigationMockFns.mockUsePathname.mockReturnValue('/workspace/workspace-1/files')
 
-const { collaborationRef, uploadFile } = vi.hoisted(() => ({
+const { collaborationRef, uploadFile, uploadProjectFile, fileSource } = vi.hoisted(() => ({
   collaborationRef: { current: null as unknown },
   uploadFile: vi.fn(),
+  uploadProjectFile: vi.fn(),
+  fileSource: { owner: undefined as { entityType: 'project'; entityId: string } | undefined },
 }))
 
 vi.mock(
@@ -37,9 +40,12 @@ vi.mock('@/lib/auth/auth-client', () => authClientMock)
 vi.mock('@/hooks/queries/workspace-files', () => ({
   useUploadWorkspaceFile: () => ({ mutateAsync: uploadFile }),
 }))
+vi.mock('@/hooks/queries/project-files', () => ({
+  useUploadProjectFile: () => ({ mutateAsync: uploadProjectFile }),
+}))
 vi.mock('@/hooks/use-add-to-chat', () => ({ useAddToChat: () => vi.fn() }))
 vi.mock('@/hooks/use-file-content-source', () => ({
-  useFileContentSource: () => ({ resolveImageSrc: (src: string) => src }),
+  useFileContentSource: () => ({ owner: fileSource.owner, resolveImageSrc: (src: string) => src }),
 }))
 vi.mock('@/app/workspace/[workspaceId]/components', () => ({ FindBar: () => null }))
 vi.mock(
@@ -99,6 +105,7 @@ const FILE: WorkspaceFileRecord = {
   uploadedAt: new Date('2026-09-03T20:00:00Z'),
 }
 let root: Root
+let queryClient: QueryClient
 let container: HTMLDivElement
 const onChange = vi.fn()
 const onEditSource = vi.fn()
@@ -168,27 +175,29 @@ async function render(
   await act(async () => {
     const update = () =>
       root.render(
-        <Suspense fallback='Loading editor'>
-          <LoadedRichMarkdownEditor
-            file={FILE}
-            workspaceId={FILE.workspaceId}
-            content={content}
-            acceptedBaselineContent={acceptedBaselineContent}
-            isStreaming={options.isStreaming ?? false}
-            streamIsIncremental={options.streamIsIncremental}
-            canEdit={canEdit}
-            userId='user-1'
-            userName='User'
-            collaborative={options.collaborative}
-            enableFind={false}
-            onChange={options.onChange ?? onChange}
-            onEditSource={onEditSource}
-            onClientAutosaveChange={onClientAutosaveChange}
-            onSaveShortcut={options.onSaveShortcut ?? onSaveShortcut}
-            downloadSourceRef={options.downloadSourceRef}
-          />
-          <SuspendAfterEditor active={options.suspend ?? false} />
-        </Suspense>
+        <QueryClientProvider client={queryClient}>
+          <Suspense fallback='Loading editor'>
+            <LoadedRichMarkdownEditor
+              file={FILE}
+              workspaceId={fileSource.owner ? undefined : FILE.workspaceId}
+              content={content}
+              acceptedBaselineContent={acceptedBaselineContent}
+              isStreaming={options.isStreaming ?? false}
+              streamIsIncremental={options.streamIsIncremental}
+              canEdit={canEdit}
+              userId='user-1'
+              userName='User'
+              collaborative={options.collaborative}
+              enableFind={false}
+              onChange={options.onChange ?? onChange}
+              onEditSource={onEditSource}
+              onClientAutosaveChange={onClientAutosaveChange}
+              onSaveShortcut={options.onSaveShortcut ?? onSaveShortcut}
+              downloadSourceRef={options.downloadSourceRef}
+            />
+            <SuspendAfterEditor active={options.suspend ?? false} />
+          </Suspense>
+        </QueryClientProvider>
       )
     if (options.suspend) startTransition(update)
     else update()
@@ -203,6 +212,8 @@ function getEditor() {
 
 beforeEach(() => {
   uploadFile.mockReset()
+  uploadProjectFile.mockReset()
+  fileSource.owner = undefined
   collaborationRef.current = null
   vi.spyOn(toast, 'warning').mockReturnValue('test-toast')
   vi.spyOn(toast, 'info').mockReturnValue('uploading-toast')
@@ -211,9 +222,13 @@ beforeEach(() => {
   container = document.createElement('div')
   document.body.append(container)
   root = createRoot(container)
+  queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: Number.POSITIVE_INFINITY } },
+  })
 })
 afterEach(async () => {
   await act(async () => root.unmount())
+  queryClient.clear()
   container.remove()
 })
 
@@ -226,6 +241,7 @@ describe('loaded rich editor lifecycle', () => {
     const frontmatter = '---\r\n# Metadata\r\ntitle: Updated\r\n---\r\n\r\n'
     config.set(FILE_DOC_SEED.frontmatterKey, frontmatter)
     collaborationRef.current = {
+      canWrite: true,
       doc,
       awareness: new Awareness(doc),
       provider,
@@ -332,6 +348,7 @@ describe('loaded rich editor lifecycle', () => {
     const doc = new Y.Doc()
     doc.getMap(FILE_DOC_SEED.configMap).set(FILE_DOC_SEED.flag, true)
     collaborationRef.current = {
+      canWrite: true,
       doc,
       awareness: new Awareness(doc),
       provider,
@@ -371,6 +388,7 @@ describe('loaded rich editor lifecycle', () => {
     const provider = new FakeFileDocProvider()
     const doc = new Y.Doc()
     collaborationRef.current = {
+      canWrite: true,
       doc,
       awareness: new Awareness(doc),
       provider,
@@ -411,6 +429,7 @@ describe('loaded rich editor lifecycle', () => {
       const doc = new Y.Doc()
       doc.getMap(FILE_DOC_SEED.configMap).set(FILE_DOC_SEED.flag, true)
       collaborationRef.current = {
+        canWrite: true,
         doc,
         awareness: new Awareness(doc),
         provider,
@@ -472,3 +491,17 @@ describe('loaded rich editor lifecycle', () => {
     expect(abandonedSave).not.toHaveBeenCalled()
   })
 })
+
+it('inserts an uploaded inline image using its Project content address', async () => {
+  fileSource.owner = { entityType: 'project', entityId: 'project-a' }
+  uploadProjectFile.mockResolvedValue({ file: { id: 'image-a' } })
+  await render('Project document')
+  await act(async () => getEditor().storage.slashCommand.insertImage(1))
+  const input = container.querySelector<HTMLInputElement>('input[type="file"]')
+  if (!input) throw new Error('Editor image picker is unavailable')
+  Object.defineProperty(input, 'files', {
+    value: [new File(['image'], 'diagram.png', { type: 'image/png' })],
+  })
+  await act(async () => input.dispatchEvent(new Event('change', { bubbles: true })))
+  expect(getEditor().getHTML()).toContain('src="/api/projects/project-a/files/image-a/content"')
+})
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 cfed0501286..6e6d7b56c29 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
@@ -12,6 +12,7 @@ import {
 } from 'react'
 import { Chip, cn, toast } from '@sim/emcn'
 import { FILE_DOC_SEED } from '@sim/realtime-protocol/file-doc'
+import { getErrorMessage } from '@sim/utils/errors'
 import { PASTE_LIMITS, PASTE_RENDER_THRESHOLDS, utf8ByteLength } from '@sim/utils/paste'
 import type { Extensions, JSONContent, Range } from '@tiptap/core'
 import { isChangeOrigin } from '@tiptap/extension-collaboration'
@@ -23,8 +24,8 @@ import {
   buildFileSelectionLabel,
   truncateSelectionText,
 } from '@/lib/mothership/chat/selection-context'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import type { FileDownloadSource } from '@/lib/uploads/client/download'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { FindBar } from '@/app/workspace/[workspaceId]/components/find-bar/find-bar'
 import { FileSaveConflict } from '@/app/workspace/[workspaceId]/files/components/file-viewer/file-save-conflict'
@@ -77,9 +78,11 @@ import { normalizeMarkdownContent } from '@/app/workspace/[workspaceId]/files/co
 import { isRoundTripSafe } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/round-trip-safety'
 import { firstHeadingTitle } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/title-heading'
 import { TextEditor } from '@/app/workspace/[workspaceId]/files/components/file-viewer/text-editor'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useEditableFileContent } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content'
 import { useSelectionCopyBridge } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge'
 import { isUntitledName } from '@/app/workspace/[workspaceId]/files/untitled-title'
+import { useUploadProjectFile } from '@/hooks/queries/project-files'
 import { useUploadWorkspaceFile } from '@/hooks/queries/workspace-files'
 import { useAddToChat } from '@/hooks/use-add-to-chat'
 import type { SaveStatus } from '@/hooks/use-autosave'
@@ -128,7 +131,8 @@ const EDITOR_SURFACE_CLASS = cn(
 /** ProseMirror block positions do not correspond to markdown source line numbers. */
 function buildEditorSelectionContext(
   editor: Editor | null,
-  file: Pick<WorkspaceFileRecord, 'id' | 'name'>
+  file: Pick<ViewerFileRecord, 'id' | 'name'>,
+  owner?: FileOperationOwner
 ): ChatContext | null {
   if (!editor) return null
   const { from, to } = editor.state.selection
@@ -137,6 +141,7 @@ function buildEditorSelectionContext(
   if (!text.trim()) return null
   return {
     kind: 'file_selection',
+    ...(owner ? { owner } : {}),
     fileId: file.id,
     fileName: file.name,
     label: buildFileSelectionLabel(file.name),
@@ -157,11 +162,13 @@ function buildEditorSelectionContext(
  */
 interface ReadOnlyPlaceholderProps {
   content: JSONContent
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }
 
 function ReadOnlyPlaceholder({ content, file, workspaceId }: ReadOnlyPlaceholderProps) {
+  const source = useFileContentSource()
+  const projectOwner = source.owner?.entityType === 'project' ? source.owner : undefined
   const containerRef = useRef<HTMLDivElement>(null)
   const editor = useEditor({
     extensions: EXTENSIONS,
@@ -196,10 +203,14 @@ function ReadOnlyPlaceholder({ content, file, workspaceId }: ReadOnlyPlaceholder
     },
   })
   const buildSelectionContext = useCallback(
-    () => buildEditorSelectionContext(editor, { id: file.id, name: file.name }),
-    [editor, file.id, file.name]
+    () => buildEditorSelectionContext(editor, { id: file.id, name: file.name }, projectOwner),
+    [editor, file.id, file.name, projectOwner]
   )
-  useSelectionCopyBridge(containerRef, buildSelectionContext, workspaceId)
+  useSelectionCopyBridge({
+    containerRef,
+    buildContext: buildSelectionContext,
+    owner: projectOwner ?? workspaceId,
+  })
   return (
     <>
       {editor && <LinkHoverCard editor={editor} />}
@@ -209,8 +220,8 @@ function ReadOnlyPlaceholder({ content, file, workspaceId }: ReadOnlyPlaceholder
 }
 
 interface RichMarkdownEditorProps {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
   canEdit: boolean
   autoFocus?: boolean
   onDirtyChange?: (isDirty: boolean) => void
@@ -397,8 +408,8 @@ function RichMarkdownSurface({
 }
 
 interface LoadedRichMarkdownEditorProps {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
   /** The live content from the engine — grows as the agent streams, then settles to the saved doc. */
   content: string
   /** Accepted external baseline, excluding local serialization echoes and own save acknowledgements. */
@@ -474,6 +485,14 @@ export function LoadedRichMarkdownEditor({
   enableFind,
   onEditSource,
 }: LoadedRichMarkdownEditorProps) {
+  const source = useFileContentSource()
+  const projectOwner = source.owner?.entityType === 'project' ? source.owner : undefined
+  const projectId = projectOwner?.entityId
+  const downloadScope = projectId
+    ? { owner: { entityType: 'project' as const, entityId: projectId } }
+    : workspaceId
+      ? { workspaceId }
+      : null
   /** Whether this editor mounted mid-stream — if so it starts empty and syncs streamed chunks until settle. */
   const [streamingAtMount] = useState(isStreaming)
 
@@ -494,11 +513,12 @@ export function LoadedRichMarkdownEditor({
   const [collaborationEnabled] = useState(
     () =>
       collaborative &&
-      canEdit &&
+      (canEdit || Boolean(projectId)) &&
       !streamingAtMount &&
       (settled?.verdict ?? false) &&
       Boolean(userId) &&
-      (file.storageContext ?? 'workspace') === 'workspace'
+      (Boolean(projectId) ||
+        (Boolean(workspaceId) && (file.storageContext ?? 'workspace') === 'workspace'))
   )
   if (
     !collaborationEnabled &&
@@ -519,15 +539,17 @@ export function LoadedRichMarkdownEditor({
     collaborationEnabled ? 'connecting' : 'ready'
   )
   const collabReady = collabStatus === 'ready'
-  const isEditable = canEdit && !isStreaming && (settled?.verdict ?? false) && collabReady
 
   const collaboration = useFileDocCollaboration({
     workspaceId,
+    projectId,
     fileId: file.id,
     userId,
     userName,
     enabled: collaborationEnabled,
   })
+  const effectiveCanEdit = canEdit && (!collaborationEnabled || collaboration?.canWrite === true)
+  const isEditable = effectiveCanEdit && !isStreaming && (settled?.verdict ?? false) && collabReady
 
   /**
    * Initial editor content. When collaborating, the Y.Doc is the source of truth —
@@ -608,8 +630,25 @@ export function LoadedRichMarkdownEditor({
 
   const containerRef = useRef<HTMLDivElement>(null)
   const uploadFile = useUploadWorkspaceFile()
+  const uploadProjectFile = useUploadProjectFile()
+  const imageUploadsRef = useRef<Set<AbortController> | null>(null)
+  imageUploadsRef.current ??= new Set<AbortController>()
+
+  useEffect(() => {
+    if (!effectiveCanEdit) {
+      for (const controller of imageUploadsRef.current ?? []) controller.abort()
+    }
+  }, [effectiveCanEdit])
+
+  useEffect(() => {
+    const uploads = imageUploadsRef.current
+    if (!uploads) return
+    return () => {
+      for (const controller of uploads) controller.abort()
+      uploads.clear()
+    }
+  }, [projectId, workspaceId, file.id])
   const editorInstanceRef = useRef<Editor | null>(null)
-  const source = useFileContentSource()
   const resolveImageSrcRef = useRef(source.resolveImageSrc)
 
   /** The picker anchor maps through edits while the operating-system file dialog is open. */
@@ -644,20 +683,51 @@ export function LoadedRichMarkdownEditor({
       const anchor = anchors[index]
       if (!anchor || findImageUpload(editor, anchor) === null) continue
       const uploadingToastId = toast.info(`Uploading "${image.name}"…`, { duration: 0 })
-      const result = await uploadFile
-        .mutateAsync({ workspaceId, file: image, folderId: file.folderId ?? null })
-        .catch(() => null)
+      const controller = new AbortController()
+      imageUploadsRef.current?.add(controller)
+      const uploadedUrl = await (projectId
+        ? uploadProjectFile
+            .mutateAsync({
+              projectId,
+              file: image,
+              folderId: file.folderId ?? null,
+              signal: controller.signal,
+            })
+            .then(
+              (result) =>
+                `/api/projects/${encodeURIComponent(projectId)}/files/${encodeURIComponent(result.file.id)}/content`
+            )
+        : workspaceId
+          ? uploadFile
+              .mutateAsync({
+                workspaceId,
+                file: image,
+                folderId: file.folderId ?? null,
+                signal: controller.signal,
+              })
+              .then((result) => result.file.url)
+          : Promise.reject(new Error('File owner is required'))
+      ).catch((error) => {
+        if (projectId && !controller.signal.aborted)
+          toast.error(getErrorMessage(error, 'Unable to upload image'))
+        return null
+      })
+      imageUploadsRef.current?.delete(controller)
       toast.dismiss(uploadingToastId)
-      if (result) {
+      if (controller.signal.aborted) {
+        for (const pending of anchors) removeImageUpload(editor, pending)
+        break
+      }
+      if (uploadedUrl) {
         const inserted = finishImageUpload(
           editor,
           anchor,
-          result.file.url,
+          uploadedUrl,
           image.name,
-          fallback ? resolveImageFileFallback(fallback, result.file.url) : undefined
+          fallback ? resolveImageFileFallback(fallback, uploadedUrl) : undefined
         )
         if (!inserted && !editor.isDestroyed) {
-          toast.info('The image was uploaded to the workspace but was not inserted.')
+          toast.info('The image was uploaded but was not inserted.')
         }
       } else {
         removeImageUpload(editor, anchor)
@@ -1246,7 +1316,7 @@ export function LoadedRichMarkdownEditor({
         syncEditorContent(content)
         pendingCollapseRef.current = false
         editor.commands.setTextSelection(editor.state.doc.content.size)
-        editor.setEditable(canEdit && settledVerdict && collabReady)
+        editor.setEditable(effectiveCanEdit && settledVerdict && collabReady)
         if (shouldFocus) editor.commands.focus('end')
       })
       return
@@ -1259,7 +1329,7 @@ export function LoadedRichMarkdownEditor({
         pendingCollapseRef.current = false
         editor.commands.setTextSelection(editor.state.doc.content.size)
       }
-      if (settled) editor.setEditable(canEdit && settled.verdict && collabReady)
+      if (settled) editor.setEditable(effectiveCanEdit && settled.verdict && collabReady)
     })
   }, [
     editor,
@@ -1268,7 +1338,7 @@ export function LoadedRichMarkdownEditor({
     settled,
     collaboration,
     isStreaming,
-    canEdit,
+    effectiveCanEdit,
     autoFocus,
     disableStreamingAutoScroll,
     collaborationEnabled,
@@ -1290,13 +1360,13 @@ export function LoadedRichMarkdownEditor({
 
   const addToChat = useAddToChat()
   const buildSelectionContext = useCallback(
-    () => buildEditorSelectionContext(editor, { id: file.id, name: file.name }),
-    [editor, file.id, file.name]
+    () => buildEditorSelectionContext(editor, { id: file.id, name: file.name }, projectOwner),
+    [editor, file.id, file.name, projectOwner]
   )
 
   const handleAddSelectionToChat = () => {
     const context = buildSelectionContext()
-    if (context) addToChat(context)
+    if (context && (workspaceId || projectOwner)) addToChat(context)
   }
 
   /** Stored content belongs to a separate preview, never to an unseeded collaborative document. */
@@ -1313,10 +1383,10 @@ export function LoadedRichMarkdownEditor({
   useImperativeHandle<FileDownloadSource | null, FileDownloadSource | null>(
     downloadSourceRef,
     () =>
-      editor && canExportSnapshot
+      editor && canExportSnapshot && downloadScope
         ? {
             fileId: file.id,
-            workspaceId,
+            ...downloadScope,
             getContent: () => {
               if (editor.isDestroyed) return null
               if (showPlaceholder) return placeholder?.markdown ?? null
@@ -1336,6 +1406,7 @@ export function LoadedRichMarkdownEditor({
       editor,
       file.id,
       workspaceId,
+      projectId,
       showPlaceholder,
       placeholder,
       collaborationEnabled,
@@ -1343,7 +1414,12 @@ export function LoadedRichMarkdownEditor({
     ]
   )
 
-  useSelectionCopyBridge(containerRef, buildSelectionContext, workspaceId, !showPlaceholder)
+  useSelectionCopyBridge({
+    containerRef,
+    buildContext: buildSelectionContext,
+    owner: projectOwner ?? workspaceId,
+    enabled: !showPlaceholder,
+  })
 
   /**
    * Find is off while the placeholder is up. The text on screen then belongs to the placeholder's own
@@ -1379,7 +1455,7 @@ export function LoadedRichMarkdownEditor({
     // The find bar is a sibling of the scroller, not a child: pinned inside `containerRef` it would
     // scroll away with the document the moment stepping moved the view.
     <div className='relative flex min-h-0 flex-1 flex-col'>
-      {canEdit && !isStreaming && settled?.verdict === false && onEditSource && (
+      {effectiveCanEdit && !isStreaming && settled?.verdict === false && onEditSource && (
         <div
           role='status'
           className='flex items-center gap-2 border-[var(--border)] border-b px-4 py-2 text-[var(--text-muted)] text-small'
@@ -1434,7 +1510,7 @@ export function LoadedRichMarkdownEditor({
           <EditorBubbleMenu
             editor={editor}
             scrollContainerRef={containerRef}
-            onAddToChat={handleAddSelectionToChat}
+            onAddToChat={workspaceId || projectOwner ? handleAddSelectionToChat : undefined}
           />
         )}
         {editor && <TableBubbleMenu editor={editor} scrollContainerRef={containerRef} />}
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 0dec965bf56..1eced9021a9 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
@@ -24,7 +24,6 @@ import {
   truncateSelectionText,
 } 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 { isSimPageSource, SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile'
 import { EditorContextMenu } from '@/app/workspace/[workspaceId]/files/components/file-viewer/editor-context-menu'
@@ -36,9 +35,11 @@ import {
 } from '@/app/workspace/[workspaceId]/files/components/file-viewer/preview-panel'
 import { PreviewLoadingFrame } from '@/app/workspace/[workspaceId]/files/components/file-viewer/preview-shared'
 import { assessTextEditorPaste } from '@/app/workspace/[workspaceId]/files/components/file-viewer/text-editor-paste'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useEditableFileContent } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-editable-file-content'
 import { useSelectionCopyBridge } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge'
 import { useAddToChat } from '@/hooks/use-add-to-chat'
+import { useFileContentSource } from '@/hooks/use-file-content-source'
 import { useFileViewerStore } from '@/stores/file-viewer/store'
 import type { ChatContext } from '@/stores/panel'
 
@@ -395,8 +396,8 @@ function useMonacoTheme(): string {
 }
 
 interface TextEditorProps {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
   canEdit: boolean
   previewMode: PreviewMode
   autoFocus?: boolean
@@ -448,6 +449,14 @@ export const TextEditor = memo(function TextEditor({
     hasSelection: boolean
   } | null>(null)
 
+  const source = useFileContentSource()
+  const projectOwner = source.owner?.entityType === 'project' ? source.owner : undefined
+  const projectId = projectOwner?.entityId
+  const downloadScope = projectId
+    ? { owner: { entityType: 'project' as const, entityId: projectId } }
+    : workspaceId
+      ? { workspaceId }
+      : null
   const monacoLanguage = resolveMonacoLanguage(file)
   const monacoTheme = useMonacoTheme()
   const addToChat = useAddToChat()
@@ -469,6 +478,7 @@ export const TextEditor = memo(function TextEditor({
         : sel.endLineNumber
     return {
       kind: 'file_selection',
+      ...(projectOwner ? { owner: projectOwner } : {}),
       fileId: file.id,
       fileName: file.name,
       label: buildFileSelectionLabel(file.name, startLine, endLine),
@@ -476,11 +486,11 @@ export const TextEditor = memo(function TextEditor({
       startLine,
       endLine,
     }
-  }, [file.id, file.name])
+  }, [file.id, file.name, projectOwner])
 
   const handleAddSelectionToChat = () => {
     const context = buildSelectionContext()
-    if (context) addToChat(context)
+    if (context && (workspaceId || projectOwner)) addToChat(context)
   }
 
   const {
@@ -513,19 +523,24 @@ export const TextEditor = memo(function TextEditor({
   useImperativeHandle<FileDownloadSource | null, FileDownloadSource | null>(
     downloadSourceRef,
     () =>
-      isContentLoading || hasContentError
+      isContentLoading || hasContentError || !downloadScope
         ? null
         : {
             fileId: file.id,
-            workspaceId,
+            ...downloadScope,
             getContent: () => contentRef.current,
           },
-    [file.id, workspaceId, isContentLoading, hasContentError]
+    [file.id, workspaceId, projectId, isContentLoading, hasContentError]
   )
 
   // Enable once content has loaded — the container (and Monaco) only mount after
   // the `isContentLoading` early return below, so the bridge must (re-)attach then.
-  useSelectionCopyBridge(containerRef, buildSelectionContext, workspaceId, !isContentLoading)
+  useSelectionCopyBridge({
+    containerRef,
+    buildContext: buildSelectionContext,
+    owner: projectOwner ?? workspaceId,
+    enabled: !isContentLoading,
+  })
 
   useEffect(() => {
     if (lastEditorValueRef.current === content) return
@@ -867,10 +882,14 @@ export const TextEditor = memo(function TextEditor({
             onClose={closeContextMenu}
             hasSelection={contextMenu.hasSelection}
             canEdit={!isEditorReadOnly}
-            onAddToChat={() => {
-              handleAddSelectionToChat()
-              closeContextMenu()
-            }}
+            onAddToChat={
+              workspaceId || projectOwner
+                ? () => {
+                    handleAddSelectionToChat()
+                    closeContextMenu()
+                  }
+                : undefined
+            }
             onCut={() => {
               monacoEditorRef.current?.focus()
               monacoEditorRef.current?.trigger(
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/types.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/types.ts
new file mode 100644
index 00000000000..8451a6c9316
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/types.ts
@@ -0,0 +1,7 @@
+import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+
+/** Display metadata shared by workspace, Project, and public viewers. */
+export interface ViewerFileRecord extends Omit<WorkspaceFileRecord, 'workspaceId' | 'uploadedBy'> {
+  workspaceId?: string
+  uploadedBy: string | null
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-doc-preview-binary.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-doc-preview-binary.ts
index 5819182db44..1421f2a1ba7 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-doc-preview-binary.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-doc-preview-binary.ts
@@ -113,6 +113,11 @@ export function stepDocPreviewBinary({
   return { resolved, hasResolvedForFile, lastGood: resolved.lastGood }
 }
 
+interface UseDocPreviewBinaryProps {
+  workspaceId: string | undefined
+  file: DocPreviewFile
+}
+
 /**
  * Resolves the compiled binary to render for a generated or uploaded document and
  * retains the last successfully fetched binary as a fallback.
@@ -126,7 +131,10 @@ export function stepDocPreviewBinary({
  * placeholder (which still holds the prior file's bytes) is ignored until a fresh
  * binary resolves for the new file, so one viewer never renders another file's content.
  */
-export function useDocPreviewBinary(workspaceId: string, file: DocPreviewFile): DocPreviewBinary {
+export function useDocPreviewBinary({
+  workspaceId,
+  file,
+}: UseDocPreviewBinaryProps): DocPreviewBinary {
   const query = useWorkspaceFileBinary(workspaceId, file.id, file.key, {
     enabled: (file.size ?? 0) > 0,
     version: Number(new Date(file.updatedAt)) || file.size,
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 06d3d241e89..dd8b5b0b721 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
@@ -4,19 +4,20 @@ import { useCallback, useEffect, useLayoutEffect, useReducer, useRef, useState }
 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 {
   INITIAL_TEXT_EDITOR_CONTENT_STATE,
   type SyncTextEditorContentStateOptions,
   textEditorContentReducer,
 } from '@/app/workspace/[workspaceId]/files/components/file-viewer/text-editor-state'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import {
   useReloadWorkspaceFileContent,
   useUpdateWorkspaceFileContent,
   useWorkspaceFileContent,
 } from '@/hooks/queries/workspace-files'
 import { type SaveStatus, useAutosave } from '@/hooks/use-autosave'
+import { useFileContentSource } from '@/hooks/use-file-content-source'
 import { useSmoothText } from '@/hooks/use-smooth-text'
 
 /**
@@ -46,8 +47,8 @@ export const RECONCILING_REFETCH_WINDOW_MS = 45_000
 export const RECONCILING_REFETCH_SLOW_INTERVAL_MS = 15_000
 
 interface UseEditableFileContentOptions {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
   canEdit: boolean
   streamingContent?: string
   isAgentEditing?: boolean
@@ -170,6 +171,7 @@ export function useEditableFileContent({
   normalizeBaseline,
   canAutosave = true,
 }: UseEditableFileContentOptions): EditableFileContent {
+  const { owner } = useFileContentSource()
   const onDirtyChangeRef = useRef(onDirtyChange)
   const onSaveStatusChangeRef = useRef(onSaveStatusChange)
 
@@ -313,6 +315,7 @@ export function useEditableFileContent({
       try {
         const result = await updateContentRef.current.mutateAsync({
           workspaceId,
+          owner,
           fileId: file.id,
           content: next,
           expectedUpdatedAt,
@@ -343,7 +346,7 @@ export function useEditableFileContent({
         throw error
       }
     },
-    [workspaceId, file.id, markSavedContent, markConflict]
+    [workspaceId, owner, file.id, markSavedContent, markConflict]
   )
 
   const autosaveEnabled =
@@ -365,7 +368,9 @@ export function useEditableFileContent({
     onSave,
     enabled: autosaveEnabled,
     pauseSaving: hasConflict || isStreamInteractionLocked,
-    draftKey: autosaveEnabled ? `${workspaceId}:${file.id}` : undefined,
+    draftKey: autosaveEnabled
+      ? `${owner?.entityType === 'project' ? `project:${owner.entityId}` : workspaceId}:${file.id}`
+      : undefined,
     onRestoreDraft: setDraftContent,
     onRestoreConflictingDraft: restoreConflictingDraft,
     onDiscardCorrectionFailed: () =>
@@ -381,6 +386,7 @@ export function useEditableFileContent({
     const draftAtStart = contentRef.current
     const result = await reloadContent.mutateAsync({
       workspaceId,
+      owner,
       fileId: file.id,
       raw: GENERATED_SOURCE_FILE_TYPES.has(file.type),
     })
@@ -401,6 +407,7 @@ export function useEditableFileContent({
   }, [
     reloadContent.mutateAsync,
     workspaceId,
+    owner,
     file.id,
     file.type,
     normalizeBaseline,
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge.ts b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge.ts
index 908951e0745..5e345ad039a 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/use-selection-copy-bridge.ts
@@ -2,8 +2,18 @@
 
 import { type RefObject, useEffect } from 'react'
 import { attachSelectionContextToClipboard } from '@/lib/mothership/chat/selection-clipboard'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import type { ChatContext } from '@/stores/panel'
 
+interface UseSelectionCopyBridgeProps {
+  containerRef: RefObject<HTMLElement | null>
+  /** Returns null when there is no non-empty selection. */
+  buildContext: () => ChatContext | null
+  owner: string | FileOperationOwner | undefined
+  /** Reattaches when a loading gate mounts the container, since a ref is not reactive. */
+  enabled?: boolean
+}
+
 /**
  * Rides a selection {@link ChatContext} onto the editor's native copy so a
  * highlighted passage copied with Cmd+C pastes into Chat as a reference chip.
@@ -12,21 +22,16 @@ import type { ChatContext } from '@/stores/panel'
  * handler — Monaco and ProseMirror both `clearData()` before writing
  * `text/plain`, so the custom type must be added last to survive.
  *
- * @param buildContext - Returns null when there is no non-empty selection.
- * @param workspaceId - Workspace that owns the selected resource.
- * @param enabled - Re-runs the effect for a container that mounts late (behind a
- * loading gate); a ref isn't reactive, so the effect would otherwise bail on the
- * first render and never re-attach.
  */
-export function useSelectionCopyBridge(
-  containerRef: RefObject<HTMLElement | null>,
-  buildContext: () => ChatContext | null,
-  workspaceId: string,
-  enabled = true
-): void {
+export function useSelectionCopyBridge({
+  containerRef,
+  buildContext,
+  owner,
+  enabled = true,
+}: UseSelectionCopyBridgeProps): void {
   useEffect(() => {
     const dom = containerRef.current
-    if (!dom || !enabled) return
+    if (!dom || !enabled || !owner) return
     const onCopy = (e: ClipboardEvent) => {
       // A copy from a field nested in the editor — Monaco's find box being the
       // common one — bubbles here while the document still holds a highlight,
@@ -38,9 +43,9 @@ export function useSelectionCopyBridge(
       // main copy path this hook exists for.
       if ((e.target as HTMLElement | null)?.tagName === 'INPUT') return
       const context = buildContext()
-      if (context) attachSelectionContextToClipboard(e.clipboardData, context, workspaceId)
+      if (context) attachSelectionContextToClipboard(e.clipboardData, context, owner)
     }
     dom.addEventListener('copy', onCopy)
     return () => dom.removeEventListener('copy', onCopy)
-  }, [containerRef, buildContext, workspaceId, enabled])
+  }, [containerRef, buildContext, owner, enabled])
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/xlsx-preview.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/xlsx-preview.tsx
index 83025fa92bd..fe635c064d0 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/xlsx-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/file-viewer/xlsx-preview.tsx
@@ -6,7 +6,7 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import type { WorkBook } from 'xlsx'
 import { assertOoxmlPreviewWithinLimits } from '@/lib/file-parsers/ooxml-preview-guard'
-import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import type { ViewerFileRecord } from '@/app/workspace/[workspaceId]/files/components/file-viewer/types'
 import { useHorizontalWheelScroll } from '@/app/workspace/[workspaceId]/files/components/file-viewer/use-horizontal-wheel-scroll'
 import {
   readXlsxPreviewData,
@@ -32,11 +32,11 @@ export const XlsxPreview = memo(function XlsxPreview({
   file,
   workspaceId,
 }: {
-  file: WorkspaceFileRecord
-  workspaceId: string
+  file: ViewerFileRecord
+  workspaceId: string | undefined
 }) {
   const scrollRef = useHorizontalWheelScroll()
-  const preview = useDocPreviewBinary(workspaceId, file)
+  const preview = useDocPreviewBinary({ workspaceId, file })
   const fileData = preview.data
 
   const [sheetNames, setSheetNames] = useState<string[]>([])
diff --git a/apps/sim/app/workspace/[workspaceId]/files/components/share-modal/share-modal.tsx b/apps/sim/app/workspace/[workspaceId]/files/components/share-modal/share-modal.tsx
index 5d354b61e49..b50292f9ba9 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/components/share-modal/share-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/components/share-modal/share-modal.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { type ComponentType, useState } from 'react'
 import {
   Chip,
   ChipButtonGroup,
@@ -20,13 +20,18 @@ import { GeneratedPasswordInput } from '@/components/ui'
 import type { ShareAuthType, ShareRecord } from '@/lib/api/contracts/public-shares'
 import { useDeploymentShape } from '@/lib/core/config/deployment-shape'
 import { validateAllowlistEntry } from '@/lib/messaging/email/validation'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
 import { useFileShare, useUpsertFileShare } from '@/hooks/queries/public-shares'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 
 interface ShareModalProps {
   open: boolean
   onOpenChange: (open: boolean) => void
-  workspaceId: string
+  owner: EditableFileOwner
   fileId: string
   fileName: string
   /** Share state already known from the file row, used as the initial value to avoid flicker. */
@@ -59,27 +64,63 @@ function savedMode(share: ShareRecord | null): ShareAuthType {
   return share?.authType ?? 'public'
 }
 
-export function ShareModal({
+interface ShareModalContentProps extends ShareModalProps {
+  workspacePolicy?: { canPublish: boolean; allowedAuthTypes: ShareAuthType[] | null }
+}
+
+function WorkspaceShareModal(props: ShareModalProps) {
+  const { config } = usePermissionConfig()
+  return (
+    <ShareModalContent
+      {...props}
+      workspacePolicy={{
+        canPublish: !config.disablePublicFileSharing,
+        allowedAuthTypes: config.allowedFileShareAuthTypes,
+      }}
+    />
+  )
+}
+
+const SHARE_MODAL_ADAPTERS: FileOwnerAdapters<ComponentType<ShareModalProps>> = {
+  workspace: WorkspaceShareModal,
+  project: ShareModalContent,
+}
+
+export function ShareModal(props: ShareModalProps) {
+  const Modal = requireFileOwnerAdapter(SHARE_MODAL_ADAPTERS, props.owner)
+  return (
+    <Modal key={`${props.owner.entityType}:${props.owner.entityId}:${props.fileId}`} {...props} />
+  )
+}
+
+function ShareModalContent({
   open,
   onOpenChange,
-  workspaceId,
+  owner,
   fileId,
   fileName,
   initialShare,
-}: ShareModalProps) {
+  workspacePolicy,
+}: ShareModalContentProps) {
   const {
-    data: share,
+    data: settings,
     isError: isShareError,
     isFetchedAfterMount,
-  } = useFileShare(workspaceId, fileId, { enabled: open })
-  const { config: permissionConfig } = usePermissionConfig()
+  } = useFileShare(owner, fileId, { enabled: open })
   const upsertShare = useUpsertFileShare()
   const { copied, copy } = useCopyToClipboard({ resetMs: 1500 })
   const { features } = useDeploymentShape()
 
+  const share = settings?.share
+  const policy = settings?.policy ?? workspacePolicy
+  const canWrite = settings?.capabilities?.canWrite ?? owner.entityType === 'workspace'
   const shareReadReady = isFetchedAfterMount && !isShareError
   const saved = shareReadReady ? (share ?? null) : (share ?? initialShare ?? null)
-  const savedAccessMode = savedMode(saved)
+  const savedAccessMode =
+    saved?.authType ??
+    (owner.entityType === 'project'
+      ? (policy?.allowedAuthTypes?.[0] ?? 'public')
+      : savedMode(saved))
 
   const [draftMode, setDraftMode] = useState<ShareAuthType | null>(null)
   const [draftPassword, setDraftPassword] = useState('')
@@ -88,7 +129,7 @@ export function ShareModal({
   const effectiveMode = draftMode ?? savedAccessMode
   const effectiveEmails = draftEmails ?? saved?.allowedEmails ?? EMPTY_EMAILS
 
-  const allowedAuthTypes = permissionConfig.allowedFileShareAuthTypes
+  const allowedAuthTypes = policy?.allowedAuthTypes ?? (workspacePolicy ? null : [])
   const isAuthTypeAllowed = (mode: ShareAuthType) =>
     allowedAuthTypes === null || allowedAuthTypes.includes(mode)
 
@@ -105,7 +146,7 @@ export function ShareModal({
 
   const modeDisallowed = !isAuthTypeAllowed(effectiveMode)
   const enableBlockedByPolicy =
-    (permissionConfig.disablePublicFileSharing && !saved?.isActive) || modeDisallowed
+    (!policy?.canPublish && (owner.entityType === 'project' || !saved?.isActive)) || modeDisallowed
 
   const passwordMissing =
     effectiveMode === 'password' && !saved?.hasPassword && draftPassword.trim().length === 0
@@ -138,9 +179,9 @@ export function ShareModal({
   }
 
   const submitPrimaryAction = () => {
-    if (!shareReadReady || upsertShare.isPending) return
+    if (!shareReadReady || !canWrite || upsertShare.isPending) return
 
-    const base = { workspaceId, fileId, token: saved ? undefined : generateShortId() }
+    const base = { owner, fileId, token: saved ? undefined : generateShortId() }
     const vars = isUnshareAction
       ? { ...base, isActive: false as const }
       : effectiveMode === 'password'
@@ -178,9 +219,10 @@ export function ShareModal({
 
   const accessHint = (() => {
     if (isShareError) return 'Unable to load the current sharing settings. Close and try again.'
+    if (!canWrite) return 'You have read-only access to this file.'
     if (modeDisallowed) return 'This sharing method is disabled by an administrator.'
     if (enableBlockedByPolicy)
-      return 'Public sharing is disabled for this workspace by an administrator.'
+      return `Public sharing is disabled for this ${owner.entityType === 'project' ? 'Project' : 'workspace'} by an administrator.`
     if (effectiveMode === 'password')
       return 'Anyone with the link and the password can view and download this file.'
     if (effectiveMode === 'email')
@@ -210,7 +252,7 @@ export function ShareModal({
               value={effectiveMode}
               onValueChange={(value) => setDraftMode(value as ShareAuthType)}
               aria-label='File access'
-              disabled={upsertShare.isPending}
+              disabled={upsertShare.isPending || !canWrite}
             >
               {accessModes.map((mode) => (
                 <ChipButtonGroupItem key={mode} value={mode}>
@@ -233,7 +275,7 @@ export function ShareModal({
                 value={draftPassword}
                 onChange={setDraftPassword}
                 placeholder={saved?.hasPassword ? '••••••••' : 'Enter a password'}
-                disabled={upsertShare.isPending}
+                disabled={upsertShare.isPending || !canWrite}
               />
             </ChipModalField>
           ) : null}
@@ -247,7 +289,7 @@ export function ShareModal({
               allowDomains
               placeholder='Enter emails or domains'
               placeholderWithTags='Add email or domain'
-              disabled={upsertShare.isPending}
+              disabled={upsertShare.isPending || !canWrite}
             />
           ) : null}
         </ChipModalBody>
@@ -274,6 +316,7 @@ export function ShareModal({
             disabled:
               upsertShare.isPending ||
               !shareReadReady ||
+              !canWrite ||
               (!isUnshareAction && (passwordMissing || emailsMissing || enableBlockedByPolicy)),
           }}
         />
diff --git a/apps/sim/app/workspace/[workspaceId]/files/files.tsx b/apps/sim/app/workspace/[workspaceId]/files/files.tsx
index bd2dc3ca547..1dcbca1bcef 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/files.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/files.tsx
@@ -3,12 +3,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
   Avatar,
-  Button,
-  ChipCombobox,
-  ChipConfirmModal,
-  Columns2,
   type ComboboxOption,
-  Eye,
   Folder,
   FolderPlus,
   Loader,
@@ -19,20 +14,17 @@ import {
   Upload,
   useCopyToClipboard,
 } from '@sim/emcn'
-import { Check, Download, Link, Send } from '@sim/emcn/icons'
+import { Check, Clock, Download, Duplicate, Link, Send } from '@sim/emcn/icons'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage, toError } from '@sim/utils/errors'
 import { useParams, useRouter } from 'next/navigation'
 import { useQueryStates } from 'nuqs'
 import { usePostHog } from 'posthog-js/react'
 import { getDocumentIcon } from '@/components/icons/document-icons'
+import type { FileCopySource } from '@/lib/api/contracts/file-copy-input'
 import { useLimitUpgradeToast } from '@/lib/billing/client'
 import { captureEvent } from '@/lib/posthog/client'
-import {
-  type FileDownloadSource,
-  triggerArchiveDownload,
-  triggerFileDownload,
-} from '@/lib/uploads/client/download'
+import { triggerArchiveDownload, triggerFileDownload } from '@/lib/uploads/client/download'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
 import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types'
 import {
@@ -45,7 +37,13 @@ import {
   resolveEffectiveMimeType,
 } from '@/lib/uploads/utils/file-utils'
 import { isSupportedExtension } from '@/lib/uploads/utils/validation'
-import { SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile'
+import {
+  FILE_BROWSER_COLUMNS,
+  FILE_BROWSER_SIZE_BOUNDARIES,
+  FILE_BROWSER_SORT_OPTIONS,
+  FILE_ROW_DRAG_MIME,
+  formatFileBrowserType,
+} from '@/lib/workspace-files/browser'
 import { FindBar } from '@/app/workspace/[workspaceId]/components/find-bar/find-bar'
 import { useFindShortcut } from '@/app/workspace/[workspaceId]/components/find-bar/use-find-shortcut'
 import type {
@@ -86,10 +84,6 @@ import type {
   SearchConfig,
   SortConfig,
 } from '@/app/workspace/[workspaceId]/components/resource/components/resource-options'
-import {
-  ResourceFilterPanel,
-  ResourceFilterSection,
-} from '@/app/workspace/[workspaceId]/components/resource/components/resource-options'
 import { timeCell } from '@/app/workspace/[workspaceId]/components/resource/components/time-cell'
 import { resourceListState } from '@/app/workspace/[workspaceId]/components/resource/is-resource-list-empty'
 import type {
@@ -104,20 +98,19 @@ import {
 import { selectionLabel } from '@/app/workspace/[workspaceId]/components/resource/selection-label'
 import { useResourceRowSelection } from '@/app/workspace/[workspaceId]/components/resource/use-resource-row-selection'
 import { DeleteConfirmModal } from '@/app/workspace/[workspaceId]/files/components/delete-confirm-modal'
-import { FileRowContextMenu } from '@/app/workspace/[workspaceId]/files/components/file-row-context-menu'
-import type { PreviewMode } from '@/app/workspace/[workspaceId]/files/components/file-viewer'
+import { FileCopyModal } from '@/app/workspace/[workspaceId]/files/components/file-copy-modal'
 import {
-  FileViewer,
-  isCsvStreamOnly,
-  isMarkdownFile,
-  isPreviewable,
-  isTextEditable,
-} from '@/app/workspace/[workspaceId]/files/components/file-viewer'
-import { FileDocAvatars } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-avatars'
-import { FileDocRoomProvider } from '@/app/workspace/[workspaceId]/files/components/file-viewer/rich-markdown-editor/collaboration/file-doc-room-context'
+  FileDetail,
+  useFileNavigation,
+} from '@/app/workspace/[workspaceId]/files/components/file-detail'
+import { FileExtractionModal } from '@/app/workspace/[workspaceId]/files/components/file-extraction-modal'
+import { FileFilterControls } from '@/app/workspace/[workspaceId]/files/components/file-filter-controls'
+import { FileHistoryModal } from '@/app/workspace/[workspaceId]/files/components/file-history-modal'
+import { FileRowContextMenu } from '@/app/workspace/[workspaceId]/files/components/file-row-context-menu'
+import { FileUploadOverlay } from '@/app/workspace/[workspaceId]/files/components/file-upload-overlay'
 import { FilesListContextMenu } from '@/app/workspace/[workspaceId]/files/components/files-list-context-menu'
 import { ShareModal } from '@/app/workspace/[workspaceId]/files/components/share-modal'
-import { useWorkspaceFilesRoom } from '@/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room'
+import { useFileUploadDrop, useWorkspaceFilesRoom } from '@/app/workspace/[workspaceId]/files/hooks'
 import FilesLoading from '@/app/workspace/[workspaceId]/files/loading'
 import {
   filesFilterParsers,
@@ -133,6 +126,7 @@ import {
   isUntitledName,
   uniqueMarkdownName,
 } from '@/app/workspace/[workspaceId]/files/untitled-title'
+import { getDroppedFiles, hasExternalFiles } from '@/app/workspace/[workspaceId]/files/utils'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
@@ -141,7 +135,6 @@ import { useWorkspaceMembersQuery, type WorkspaceMember } from '@/hooks/queries/
 import {
   useBulkArchiveWorkspaceFileItems,
   useCreateWorkspaceFileFolder,
-  useExtractWorkspaceFile,
   useMoveWorkspaceFileItems,
   useUpdateWorkspaceFileFolder,
   useWorkspaceFileFolders,
@@ -163,7 +156,6 @@ import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
 import { useUrlSort } from '@/hooks/use-url-sort'
 import type { ResourceListPreference } from '@/stores/resource-list-preferences'
 
-type SaveStatus = 'idle' | 'saving' | 'saved' | 'error'
 type FileResourceItem =
   | { kind: 'file'; id: string; file: WorkspaceFileRecord }
   | { kind: 'folder'; id: string; folder: WorkspaceFileFolderApi }
@@ -175,12 +167,6 @@ type FileListEntry =
 
 const logger = createLogger('Files')
 
-/**
- * This list's private drag MIME, so a drag started on another list is never mistaken for one of
- * these rows.
- */
-const FILE_ROW_DRAG_MIME = 'application/x-sim-workspace-file-rows'
-
 const FILES_HEADER = FOLDERED_RESOURCE_HEADERS.file
 
 const FOLDER_ICON = <Folder className='size-[14px]' />
@@ -194,14 +180,7 @@ const FOLDER_TYPE_LABEL = 'Folder' as const
  */
 const FILES_SEARCH_DEBOUNCE_MS = 200 as const
 
-const COLUMNS: ResourceColumn[] = [
-  { id: 'name', header: 'Name', widthMultiplier: 1.15 },
-  { id: 'size', header: 'Size', widthMultiplier: 0.85 },
-  { id: 'type', header: 'Type', widthMultiplier: 1.0 },
-  { id: 'created', header: 'Created' },
-  { id: 'owner', header: 'Owner' },
-  { id: 'updated', header: 'Last Updated' },
-]
+const COLUMNS: ResourceColumn[] = [...FILE_BROWSER_COLUMNS]
 
 /**
  * Deliberately absent from {@link filesSortParams}, so the location column is not offered in
@@ -210,66 +189,10 @@ const COLUMNS: ResourceColumn[] = [
  */
 const SEARCH_COLUMNS: ResourceColumn[] = [...COLUMNS, FOLDER_LOCATION_COLUMN]
 
-const MIME_TYPE_LABELS: Record<string, string> = {
-  'application/pdf': 'PDF',
-  'application/zip': 'ZIP',
-  'application/msword': 'Word',
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 'Word',
-  'application/vnd.ms-excel': 'Excel',
-  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': 'Excel',
-  'application/vnd.ms-powerpoint': 'PowerPoint',
-  'application/vnd.openxmlformats-officedocument.presentationml.presentation': 'PowerPoint',
-  'application/json': 'JSON',
-  'application/x-yaml': 'YAML',
-  'text/csv': 'CSV',
-  'text/plain': 'Text',
-  'text/html': 'HTML',
-  'text/x-sim-page': 'Page',
-  'text/markdown': 'Markdown',
-}
-
 const EMPTY_WORKSPACE_FILES: WorkspaceFileRecord[] = []
 const EMPTY_WORKSPACE_FILE_FOLDERS: WorkspaceFileFolderApi[] = []
 const EMPTY_FIND_MATCH_IDS: readonly string[] = Object.freeze([])
 
-const hasExternalFiles = (dataTransfer: DataTransfer): boolean =>
-  dataTransfer.types.includes('Files')
-
-function formatFileType(storedType: string | null, filename: string): string {
-  const mimeType = resolveEffectiveMimeType(storedType, filename)
-
-  if (MIME_TYPE_LABELS[mimeType]) {
-    return MIME_TYPE_LABELS[mimeType]
-  }
-
-  if (mimeType.startsWith('audio/')) return 'Audio'
-  if (mimeType.startsWith('video/')) return 'Video'
-  if (mimeType.startsWith('image/')) return 'Image'
-
-  const ext = getFileExtension(filename)
-  if (ext) return ext.toUpperCase()
-
-  return storedType ?? 'File'
-}
-
-function getDroppedFiles(dataTransfer: DataTransfer): File[] {
-  if (dataTransfer.items.length === 0) return Array.from(dataTransfer.files)
-  const files: File[] = []
-  for (const item of Array.from(dataTransfer.items)) {
-    if (item.kind !== 'file') continue
-    const entry = item.webkitGetAsEntry?.()
-    if (entry?.isDirectory) {
-      toast.error(`Cannot upload the folder "${entry.name}"`, {
-        description: 'Create a folder in Files, then upload the files inside it.',
-      })
-      continue
-    }
-    const file = item.getAsFile()
-    if (file) files.push(file)
-  }
-  return files
-}
-
 export function Files() {
   return (
     <PermissionAccessBoundary configKey='hideFilesTab'>
@@ -280,16 +203,22 @@ export function Files() {
 
 function FilesContent() {
   const fileInputRef = useRef<HTMLInputElement>(null)
+  const [copySource, setCopySource] = useState<FileCopySource | null>(null)
   const uploadQueueRef = useRef<Promise<void>>(Promise.resolve())
-  const saveRef = useRef<(() => Promise<void>) | null>(null)
-  const downloadSourceRef = useRef<FileDownloadSource | null>(null)
-  const discardRef = useRef<(() => void) | null>(null)
 
   const params = useParams()
   const router = useRouter()
-  const [{ folderId: currentFolderId, new: isNewFile, shareFileId }, setFilesParams] =
-    useQueryStates(filesParsers, filesUrlKeys)
+  const [
+    { folderId: currentFolderId, new: isNewFile, shareFileId, historyFileId },
+    setFilesParams,
+  ] = useQueryStates(filesParsers, filesUrlKeys)
   const workspaceId = params?.workspaceId as string
+  const {
+    downloadSourceRef,
+    setIsDirty,
+    setSaveStatus,
+    navigate: handleNavigateFromFileDetail,
+  } = useFileNavigation({ owner: { entityType: 'workspace', entityId: workspaceId } })
 
   const posthog = usePostHog()
   const posthogRef = useRef(posthog)
@@ -343,7 +272,6 @@ function FilesContent() {
   const deleteFile = useDeleteWorkspaceFile()
   const renameFile = useRenameWorkspaceFile()
   const createFolder = useCreateWorkspaceFileFolder()
-  const extractFile = useExtractWorkspaceFile()
   const updateFolder = useUpdateWorkspaceFileFolder()
   const moveItems = useMoveWorkspaceFileItems()
   const bulkArchiveItems = useBulkArchiveWorkspaceFileItems()
@@ -388,20 +316,6 @@ function FilesContent() {
   })
   /** An upload batch is in flight exactly while a total is set — matches the Tables page. */
   const uploading = uploadProgress.total > 0
-  const [isDraggingOver, setIsDraggingOver] = useState(false)
-  const dragCounterRef = useRef(0)
-  /**
-   * Takes down the "Drop to upload" overlay.
-   *
-   * Every path that consumes an OS file drag has to call this, including the one that never
-   * reaches the page-level handler: a drop on a folder row is handled by the drag hook, which
-   * stops propagation, so `handleDrop` below never runs and the counter it would have zeroed
-   * keeps the overlay on screen over the finished upload.
-   */
-  const dismissUploadOverlay = useCallback(() => {
-    dragCounterRef.current = 0
-    setIsDraggingOver(false)
-  }, [])
   const [
     { search: urlSearchTerm, type: typeFilter, size: sizeFilter, uploadedBy: uploadedByFilter },
     setFileFilters,
@@ -500,18 +414,6 @@ function FilesContent() {
   )
 
   const [creatingFile, setCreatingFile] = useState(false)
-  const [isDirty, setIsDirty] = useState(false)
-  const [saveStatus, setSaveStatus] = useState<SaveStatus>('idle')
-  const [previewMode, setPreviewMode] = useState<PreviewMode>(() => {
-    if (isNewFile) return 'editor'
-    if (fileIdFromRoute) {
-      const file = files.find((f) => f.id === fileIdFromRoute)
-      if (file && isPreviewable(file)) return 'preview'
-      return 'editor'
-    }
-    return 'preview'
-  })
-  const [showUnsavedChangesAlert, setShowUnsavedChangesAlert] = useState(false)
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
   const [extractTargetId, setExtractTargetId] = useState<string | null>(null)
   const extractTarget = extractTargetId ? (fileById.get(extractTargetId) ?? null) : null
@@ -576,6 +478,22 @@ function FilesContent() {
     [workspaceId]
   )
 
+  const historyFile = historyFileId ? files.find((file) => file.id === historyFileId) : undefined
+  const browserModals = (
+    <>
+      {historyFile && (
+        <FileHistoryModal
+          key={`${workspaceId}:${historyFile.id}`}
+          owner={{ entityType: 'workspace', entityId: workspaceId }}
+          fileId={historyFile.id}
+          fileName={historyFile.name}
+          canWrite={canEdit}
+          onClose={() => void setFilesParams({ historyFileId: null }, { history: 'replace' })}
+        />
+      )}
+      {copySource && <FileCopyModal source={copySource} onClose={() => setCopySource(null)} />}
+    </>
+  )
   const shareFile = shareFileId ? (files.find((f) => f.id === shareFileId) ?? null) : null
   const shareModal = shareFile ? (
     <ShareModal
@@ -583,7 +501,7 @@ function FilesContent() {
       onOpenChange={(open) =>
         !open && setFilesParams({ shareFileId: null }, { history: 'replace' })
       }
-      workspaceId={workspaceId}
+      owner={{ entityType: 'workspace', entityId: workspaceId }}
       fileId={shareFile.id}
       fileName={shareFile.name}
       initialShare={shareFile.share ?? null}
@@ -678,10 +596,15 @@ function FilesContent() {
 
     if (sizeFilter.length > 0) {
       result = result.filter((f) => {
-        if (sizeFilter.includes('small') && f.size < 1_048_576) return true
-        if (sizeFilter.includes('medium') && f.size >= 1_048_576 && f.size <= 10_485_760)
+        if (sizeFilter.includes('small') && f.size < FILE_BROWSER_SIZE_BOUNDARIES.small) return true
+        if (
+          sizeFilter.includes('medium') &&
+          f.size >= FILE_BROWSER_SIZE_BOUNDARIES.small &&
+          f.size <= FILE_BROWSER_SIZE_BOUNDARIES.medium
+        )
+          return true
+        if (sizeFilter.includes('large') && f.size > FILE_BROWSER_SIZE_BOUNDARIES.medium)
           return true
-        if (sizeFilter.includes('large') && f.size > 10_485_760) return true
         return false
       })
     }
@@ -736,7 +659,7 @@ function FilesContent() {
           sortColumn === 'size'
             ? file.size
             : sortColumn === 'type'
-              ? formatFileType(file.type, file.name)
+              ? formatFileBrowserType(file.type, file.name)
               : sortColumn === 'created'
                 ? new Date(file.uploadedAt).getTime()
                 : sortColumn === 'updated'
@@ -817,7 +740,7 @@ function FilesContent() {
             },
             type: {
               icon: <Icon className='size-[14px]' />,
-              label: formatFileType(file.type, file.name),
+              label: formatFileBrowserType(file.type, file.name),
             },
             created: timeCell(file.uploadedAt),
             owner: file.uploadedBy
@@ -1021,11 +944,12 @@ function FilesContent() {
 
   const rowDragDropConfig = useFolderRowDragDrop({
     dragMime: FILE_ROW_DRAG_MIME,
+    owner: { entityType: 'workspace', entityId: workspaceId },
     canEdit,
     editingRowId: listRename.editingId,
     descendantsByFolderId: descendantFolderIdsByFolderId,
-    getFolderParentId: (folderId) => folderByIdRef.current.get(folderId)?.parentId ?? null,
-    getResourceFolderId: (fileId) => fileByIdRef.current.get(fileId)?.folderId ?? null,
+    getFolderParentId: (folderId) => folderByIdRef.current.get(folderId)?.parentId,
+    getResourceFolderId: (fileId) => fileByIdRef.current.get(fileId)?.folderId,
     getRowLabel: (rowId) => {
       const parsed = parseFolderedRowId(rowId)
       return parsed.kind === 'folder'
@@ -1062,7 +986,7 @@ function FilesContent() {
     externalDrop: {
       matches: hasExternalFiles,
       onDropIntoFolder: (dataTransfer, targetFolderId) => {
-        dismissUploadOverlay()
+        uploadDrop.dismiss()
         const dropped = getDroppedFiles(dataTransfer)
         if (dropped.length > 0) void uploadFiles(dropped, targetFolderId)
       },
@@ -1076,38 +1000,13 @@ function FilesContent() {
     if (fileInputRef.current) fileInputRef.current.value = ''
   }
 
-  const handleDragEnter = (e: React.DragEvent) => {
-    if (!hasExternalFiles(e.dataTransfer)) return
-    e.preventDefault()
-    dragCounterRef.current++
-    setIsDraggingOver(true)
-  }
-
-  const handleDragLeave = (e: React.DragEvent) => {
-    if (!hasExternalFiles(e.dataTransfer)) return
-    dragCounterRef.current--
-    if (dragCounterRef.current === 0) setIsDraggingOver(false)
-  }
-
-  const handleDragOver = (e: React.DragEvent) => {
-    if (!hasExternalFiles(e.dataTransfer)) return
-    e.preventDefault()
-    e.dataTransfer.dropEffect = 'copy'
-  }
-
-  const handleDrop = async (e: React.DragEvent) => {
-    if (!hasExternalFiles(e.dataTransfer)) return
-    e.preventDefault()
-    /**
-     * The upload lands in the folder currently open, so the view must stay there. Without this
-     * the window-level teardown treats the drag as unconsumed and returns to the folder it
-     * began in — pulling the user out of the folder they just spring-opened to receive it.
-     */
-    rowDragDropConfig.externalDropHandled()
-    dismissUploadOverlay()
-    const dropped = getDroppedFiles(e.dataTransfer)
-    if (dropped.length > 0) await uploadFiles(dropped)
-  }
+  const uploadDrop = useFileUploadDrop({
+    enabled: canEdit,
+    onDrop: (files) => {
+      rowDragDropConfig.externalDropHandled()
+      if (files.length > 0) void uploadFiles(files)
+    },
+  })
 
   const handleDownload = useCallback(
     async (file: WorkspaceFileRecord) => {
@@ -1165,40 +1064,6 @@ function FilesContent() {
     }
   }, [workspaceId, router, currentFolderId])
 
-  const isDirtyRef = useRef(isDirty)
-  isDirtyRef.current = isDirty
-  const saveStatusRef = useRef(saveStatus)
-  saveStatusRef.current = saveStatus
-  const pendingFileNavigationUrlRef = useRef<string | null>(null)
-
-  const handleSave = useCallback(async () => {
-    if (!saveRef.current || !isDirtyRef.current || saveStatusRef.current === 'saving') return
-    await saveRef.current()
-  }, [])
-
-  const handleSaveStatusChange = useCallback((status: SaveStatus, retry?: () => Promise<void>) => {
-    setSaveStatus(status)
-    if (status === 'error') {
-      toast.error(`Failed to save "${selectedFileRef.current?.name ?? 'file'}"`, {
-        action: { label: 'Retry', onClick: () => void retry?.() },
-      })
-    }
-  }, [])
-
-  const handleNavigateFromFileDetail = useCallback(
-    (url: string) => {
-      if (isDirtyRef.current) {
-        pendingFileNavigationUrlRef.current = url
-        setShowUnsavedChangesAlert(true)
-        return
-      }
-
-      setPreviewMode('editor')
-      router.push(url)
-    },
-    [router]
-  )
-
   const handleStartHeaderRename = useCallback(() => {
     const file = selectedFileRef.current
     if (file) headerRename.startRename(file.id, file.name)
@@ -1323,19 +1188,6 @@ function FilesContent() {
     handleDeleteSelected,
   ])
 
-  const handleDiscardChanges = () => {
-    discardRef.current?.()
-    setShowUnsavedChangesAlert(false)
-    setIsDirty(false)
-    setSaveStatus('idle')
-    setPreviewMode('editor')
-    const folderId = selectedFileRef.current?.folderId ?? null
-    const targetUrl =
-      pendingFileNavigationUrlRef.current ?? folderedResourceListHref('file', workspaceId, folderId)
-    pendingFileNavigationUrlRef.current = null
-    router.push(targetUrl)
-  }
-
   const creatingFileRef = useRef(creatingFile)
   creatingFileRef.current = creatingFile
 
@@ -1459,6 +1311,23 @@ function FilesContent() {
     closeContextMenu()
   }, [selectedRowIds, handleBulkDownload, closeContextMenu, downloadArchive, handleDownload])
 
+  const handleCopySelection = useCallback(() => {
+    if (selectedFileIds.length + selectedFolderIds.length === 0) return
+    setCopySource({
+      owner: { entityType: 'workspace', entityId: workspaceId },
+      fileIds: selectedFileIds,
+      folderIds: selectedFolderIds,
+    })
+    closeContextMenu()
+  }, [workspaceId, selectedFileIds, selectedFolderIds, closeContextMenu])
+
+  const handleContextMenuHistory = useCallback(() => {
+    const item = contextMenuItemRef.current
+    if (item?.kind === 'file')
+      void setFilesParams({ historyFileId: item.file.id }, { history: 'replace' })
+    closeContextMenu()
+  }, [setFilesParams, closeContextMenu])
+
   const handleContextMenuCopyLink = useCallback(() => {
     const item = contextMenuItemRef.current
     if (item?.kind === 'file') {
@@ -1554,50 +1423,12 @@ function FilesContent() {
     closeListContextMenu()
   }, [canEdit, uploading, closeListContextMenu])
 
-  /**
-   * Tracks the route target whose preview mode has been applied. Starts at
-   * null (the list view) rather than the initial route id because on a hard
-   * load the files list may not have arrived when the mode initializer ran —
-   * a deep-linked previewable file would otherwise be locked into the code
-   * editor. The effect therefore defers until the routed file is resolvable:
-   * either its record exists, or the files query has settled (so a missing
-   * id decides 'editor' instead of waiting forever).
-   */
-  const appliedModeFileIdRef = useRef<string | null>(null)
-  const routedFileResolved = selectedFile != null || !isLoading
-  useEffect(() => {
-    if (fileIdFromRoute === appliedModeFileIdRef.current) return
-    const isJustCreated =
-      isNewFile || (fileIdFromRoute != null && justCreatedFileIdRef.current === fileIdFromRoute)
-    if (justCreatedFileIdRef.current && !isJustCreated) {
-      justCreatedFileIdRef.current = null
-    }
-    if (fileIdFromRoute != null && !routedFileResolved && !isJustCreated) return
-    appliedModeFileIdRef.current = fileIdFromRoute
-    const file = fileIdFromRoute ? selectedFileRef.current : null
-    const nextMode: PreviewMode =
-      !isJustCreated && file && isPreviewable(file) ? 'preview' : 'editor'
-    setPreviewMode((current) => (nextMode === current ? current : nextMode))
-  }, [fileIdFromRoute, isNewFile, routedFileResolved])
-
   useEffect(() => {
     if (isNewFile && fileIdFromRoute) {
       void setFilesParams({ new: null }, { history: 'replace', scroll: false })
     }
   }, [isNewFile, fileIdFromRoute, setFilesParams])
 
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (!fileIdFromRouteRef.current) return
-      if ((e.metaKey || e.ctrlKey) && e.key === 's') {
-        e.preventDefault()
-        handleSave()
-      }
-    }
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [handleSave])
-
   const selectedRowIdsRef = useRef(selectedRowIds)
   selectedRowIdsRef.current = selectedRowIds
   const visibleRowIdsRef = useRef(visibleRowIds)
@@ -1652,54 +1483,9 @@ function FilesContent() {
     onOpen: handleFindOpen,
   })
 
-  const handleCyclePreviewMode = useCallback(() => {
-    setPreviewMode((prev) => {
-      if (prev === 'editor') return 'split'
-      if (prev === 'split') return 'preview'
-      return 'editor'
-    })
-  }, [])
-
-  const handleTogglePreview = useCallback(() => {
-    setPreviewMode((prev) => (prev === 'preview' ? 'editor' : 'preview'))
-  }, [])
-
   const fileActions = useMemo<ResourceAction[]>(() => {
     if (!selectedFile) return []
-    // A large CSV renders as a read-only streamed preview (no editor), so it gets neither the
-    // edit/split/preview toggle nor autosave — just like a non-editable file.
-    const streamOnly = isCsvStreamOnly(selectedFile)
-    const canEditText = isTextEditable(selectedFile) && !streamOnly
-    const canPreview = isPreviewable(selectedFile) && !streamOnly
-    // Markdown renders in the single-surface inline editor, which has no raw/split/preview modes.
-    const isInlineMarkdown = isMarkdownFile(selectedFile)
-    // A Sim page is locked to its rendered view — no code view to toggle to.
-    const isSimPage = selectedFile.type === SIM_PAGE_CONTENT_TYPE
-    const hasSplitView = canEditText && canPreview && !isInlineMarkdown && !isSimPage
-    const showPreviewToggle = canPreview && !isInlineMarkdown && !isSimPage
-    const nextModeLabel =
-      previewMode === 'editor' ? 'Split' : previewMode === 'split' ? 'Preview' : 'Edit'
-    const nextModeIcon =
-      previewMode === 'editor' ? Columns2 : previewMode === 'split' ? Eye : Pencil
-
     return [
-      ...(hasSplitView
-        ? [
-            {
-              text: nextModeLabel,
-              icon: nextModeIcon,
-              onSelect: handleCyclePreviewMode,
-            },
-          ]
-        : showPreviewToggle
-          ? [
-              {
-                text: previewMode === 'preview' ? 'Edit' : 'Preview',
-                icon: previewMode === 'preview' ? Pencil : Eye,
-                onSelect: handleTogglePreview,
-              },
-            ]
-          : []),
       {
         id: 'copy-link',
         text: copiedFileLink ? 'Copied!' : 'Copy Link',
@@ -1714,6 +1500,24 @@ function FilesContent() {
         icon: Download,
         onSelect: handleDownloadSelected,
       },
+      {
+        id: 'history',
+        text: 'Version History',
+        icon: Clock,
+        onSelect: () =>
+          void setFilesParams({ historyFileId: selectedFile.id }, { history: 'replace' }),
+      },
+      {
+        id: 'copy',
+        text: 'Copy to...',
+        icon: Duplicate,
+        onSelect: () =>
+          setCopySource({
+            owner: { entityType: 'workspace', entityId: workspaceId },
+            fileIds: [selectedFile.id],
+            folderIds: [],
+          }),
+      },
       ...(canEdit
         ? [
             {
@@ -1732,10 +1536,8 @@ function FilesContent() {
     ]
   }, [
     selectedFile,
+    setFilesParams,
     canEdit,
-    previewMode,
-    handleCyclePreviewMode,
-    handleTogglePreview,
     handleDownloadSelected,
     copiedFileLink,
     copyFileLink,
@@ -1778,21 +1580,6 @@ function FilesContent() {
     [router, workspaceId, navigateToFolder]
   )
 
-  const handleExtract = async () => {
-    if (!extractTarget || !canEdit) return
-    try {
-      await extractFile.mutateAsync({
-        workspaceId,
-        fileId: extractTarget.id,
-        fileName: extractTarget.name,
-      })
-    } catch (error) {
-      logger.error('Failed to unzip archive:', error)
-    } finally {
-      setExtractTargetId(null)
-    }
-  }
-
   const handleUploadClick = useCallback(() => {
     if (!canEdit || uploading) return
     fileInputRef.current?.click()
@@ -1954,14 +1741,7 @@ function FilesContent() {
 
   const sortConfig: SortConfig = useMemo(
     () => ({
-      options: [
-        { id: 'name', label: 'Name' },
-        { id: 'size', label: 'Size' },
-        { id: 'type', label: 'Type' },
-        { id: 'created', label: 'Created' },
-        { id: 'updated', label: 'Last Updated' },
-        { id: 'owner', label: 'Owner' },
-      ],
+      options: [...FILE_BROWSER_SORT_OPTIONS],
       active: activeSort,
       onSort: setListSort,
       onClear: clearListSort,
@@ -1969,117 +1749,30 @@ function FilesContent() {
     [activeSort, setListSort, clearListSort]
   )
 
-  const hasActiveFilters =
-    typeFilter.length > 0 || sizeFilter.length > 0 || uploadedByFilter.length > 0
-
-  const filterContent = useMemo(() => {
-    const typeDisplayLabel =
-      typeFilter.length === 0
-        ? 'All'
-        : typeFilter.length === 1
-          ? ((
-              {
-                document: 'Documents',
-                image: 'Images',
-                audio: 'Audio',
-                video: 'Video',
-              } as Record<string, string>
-            )[typeFilter[0]] ?? typeFilter[0])
-          : `${typeFilter.length} selected`
-
-    const sizeDisplayLabel =
-      sizeFilter.length === 0
-        ? 'All'
-        : sizeFilter.length === 1
-          ? (({ small: 'Small', medium: 'Medium', large: 'Large' } as Record<string, string>)[
-              sizeFilter[0]
-            ] ?? sizeFilter[0])
-          : `${sizeFilter.length} selected`
-
-    const uploadedByDisplayLabel =
-      uploadedByFilter.length === 0
-        ? 'All'
-        : uploadedByFilter.length === 1
-          ? (membersById.get(uploadedByFilter[0])?.name ?? '1 member')
-          : `${uploadedByFilter.length} members`
-
-    return (
-      <ResourceFilterPanel>
-        <ResourceFilterSection label='File Type'>
-          <ChipCombobox
-            options={[
-              { value: 'document', label: 'Documents' },
-              { value: 'image', label: 'Images' },
-              { value: 'audio', label: 'Audio' },
-              { value: 'video', label: 'Video' },
-            ]}
-            multiSelect
-            multiSelectValues={typeFilter}
-            onMultiSelectChange={setTypeFilter}
-            overlayLabel={typeDisplayLabel}
-            overlayContent={typeDisplayLabel}
-            showAllOption
-            allOptionLabel='All'
-            className='w-full'
-          />
-        </ResourceFilterSection>
-        <ResourceFilterSection label='Size'>
-          <ChipCombobox
-            options={[
-              { value: 'small', label: 'Small (< 1 MB)' },
-              { value: 'medium', label: 'Medium (1–10 MB)' },
-              { value: 'large', label: 'Large (> 10 MB)' },
-            ]}
-            multiSelect
-            multiSelectValues={sizeFilter}
-            onMultiSelectChange={setSizeFilter}
-            overlayLabel={sizeDisplayLabel}
-            overlayContent={sizeDisplayLabel}
-            showAllOption
-            allOptionLabel='All'
-            className='w-full'
-          />
-        </ResourceFilterSection>
-        {memberOptions.length > 0 && (
-          <ResourceFilterSection label='Uploaded By'>
-            <ChipCombobox
-              options={memberOptions}
-              multiSelect
-              multiSelectValues={uploadedByFilter}
-              onMultiSelectChange={setUploadedByFilter}
-              overlayLabel={uploadedByDisplayLabel}
-              overlayContent={uploadedByDisplayLabel}
-              searchable
-              searchPlaceholder='Search members...'
-              showAllOption
-              allOptionLabel='All'
-              className='w-full'
-            />
-          </ResourceFilterSection>
-        )}
-        {hasActiveFilters && (
-          <Button
-            variant='ghost'
-            onClick={clearFileFilters}
-            className='h-[32px] w-full text-caption hover-hover:bg-[var(--surface-active)]'
-          >
-            Clear all filters
-          </Button>
-        )}
-      </ResourceFilterPanel>
-    )
-  }, [
-    typeFilter,
-    sizeFilter,
-    uploadedByFilter,
-    memberOptions,
-    membersById,
-    hasActiveFilters,
-    setTypeFilter,
-    setSizeFilter,
-    setUploadedByFilter,
-    clearFileFilters,
-  ])
+  const filterContent = useMemo(
+    () => (
+      <FileFilterControls
+        types={typeFilter}
+        sizes={sizeFilter}
+        creatorIds={uploadedByFilter}
+        creators={memberOptions}
+        onTypes={setTypeFilter}
+        onSizes={setSizeFilter}
+        onCreators={setUploadedByFilter}
+        onClear={clearFileFilters}
+      />
+    ),
+    [
+      typeFilter,
+      sizeFilter,
+      uploadedByFilter,
+      memberOptions,
+      setTypeFilter,
+      setSizeFilter,
+      setUploadedByFilter,
+      clearFileFilters,
+    ]
+  )
 
   /** Stable identity so the memoized `Resource.Options` can bail; an inline object cannot. */
   const filterConfig = useMemo(() => ({ content: filterContent }), [filterContent])
@@ -2161,45 +1854,23 @@ function FilesContent() {
   if (selectedFile) {
     return (
       <>
-        {/* The room provider scopes "who's in this file" presence to the open document: the
-            editor (inside FileViewer) publishes the server-authenticated roster and the
-            header's FileDocAvatars reads it — both must be descendants. */}
-        <FileDocRoomProvider>
-          <Resource>
-            <Resource.Header
-              icon={FILES_HEADER.rootIcon}
-              breadcrumbs={fileDetailBreadcrumbs}
-              actions={fileActions}
-              aside={<FileDocAvatars />}
-            />
-            <FileViewer
-              key={selectedFile.id}
-              file={selectedFile}
-              workspaceId={workspaceId}
-              canEdit={canEdit}
-              previewMode={previewMode}
-              autoFocus={isNewFile || justCreatedFileIdRef.current === selectedFile.id}
-              onDirtyChange={setIsDirty}
-              onSaveStatusChange={handleSaveStatusChange}
-              saveRef={saveRef}
-              downloadSourceRef={downloadSourceRef}
-              discardRef={discardRef}
-              collaborative
-              onDeriveTitleFromHeading={handleDeriveTitleFromHeading}
-              enableFind
-            />
-
-            <ChipConfirmModal
-              open={showUnsavedChangesAlert}
-              onOpenChange={setShowUnsavedChangesAlert}
-              srTitle='Unsaved Changes'
-              title='Unsaved Changes'
-              text='You have unsaved changes. Are you sure you want to discard them?'
-              dismissLabel='Keep editing'
-              confirm={{ label: 'Discard Changes', onClick: handleDiscardChanges }}
-            />
-          </Resource>
-        </FileDocRoomProvider>
+        <FileDetail
+          key={selectedFile.id}
+          header={{
+            icon: FILES_HEADER.rootIcon,
+            breadcrumbs: fileDetailBreadcrumbs,
+            actions: fileActions,
+          }}
+          viewer={{
+            file: selectedFile,
+            workspaceId,
+            canEdit,
+            autoFocus: isNewFile || justCreatedFileIdRef.current === selectedFile.id,
+            collaborative: true,
+            onDeriveTitleFromHeading: handleDeriveTitleFromHeading,
+            enableFind: true,
+          }}
+        />
 
         <DeleteConfirmModal
           open={showDeleteConfirm}
@@ -2211,6 +1882,7 @@ function FilesContent() {
           isPending={deleteFile.isPending || bulkArchiveItems.isPending}
         />
 
+        {browserModals}
         {shareModal}
       </>
     )
@@ -2227,13 +1899,7 @@ function FilesContent() {
     : false
 
   return (
-    <div
-      className='relative flex h-full flex-col overflow-hidden'
-      onDragEnter={canEdit ? handleDragEnter : undefined}
-      onDragLeave={canEdit ? handleDragLeave : undefined}
-      onDragOver={canEdit ? handleDragOver : undefined}
-      onDrop={canEdit ? handleDrop : undefined}
-    >
+    <div className='relative flex h-full flex-col overflow-hidden' {...uploadDrop.handlers}>
       <Resource onContextMenu={handleContentContextMenu}>
         <Resource.Header
           icon={FILES_HEADER.rootIcon}
@@ -2290,6 +1956,7 @@ function FilesContent() {
               <ResourceActionBar
                 selectedCount={selectedRowIds.size}
                 onDownload={handleBulkDownload}
+                onCopy={handleCopySelection}
                 onMove={canEdit ? handleContextMenuMove : undefined}
                 moveOptions={canEdit ? contextMenuMoveOptions : undefined}
                 onDelete={canEdit ? handleBulkDelete : undefined}
@@ -2297,17 +1964,7 @@ function FilesContent() {
                   bulkArchiveItems.isPending || moveItems.isPending || isDownloadingArchive
                 }
               />
-              {isDraggingOver ? (
-                <div className='pointer-events-none absolute inset-0 z-[var(--z-dropdown)] flex flex-col items-center justify-center gap-2 border border-[var(--brand-secondary)] border-dashed bg-[var(--white)] transition-colors dark:bg-[var(--surface-4)]'>
-                  <Upload className='size-5 text-[var(--brand-secondary)]' />
-                  <div className='flex flex-col gap-0.5 text-center'>
-                    <p className='text-[var(--brand-secondary)] text-sm'>Drop to upload</p>
-                    <p className='text-[var(--text-tertiary)] text-xs'>
-                      Release files here to add them to this workspace
-                    </p>
-                  </div>
-                </div>
-              ) : null}
+              {uploadDrop.isDraggingOver && <FileUploadOverlay destination='this workspace' />}
             </>
           }
         />
@@ -2332,6 +1989,8 @@ function FilesContent() {
         onOpen={handleContextMenuOpen}
         onCopyLink={contextMenuItem?.kind === 'file' ? handleContextMenuCopyLink : undefined}
         onDownload={handleContextMenuDownload}
+        onCopy={handleCopySelection}
+        onHistory={contextMenuItem?.kind === 'file' ? handleContextMenuHistory : undefined}
         onRename={handleContextMenuRename}
         onDelete={handleContextMenuDelete}
         onMove={handleContextMenuMove}
@@ -2353,26 +2012,18 @@ function FilesContent() {
         isPending={deleteFile.isPending || bulkArchiveItems.isPending}
       />
 
-      <ChipConfirmModal
-        open={Boolean(extractTarget)}
-        onOpenChange={(open) => !open && setExtractTargetId(null)}
-        title='Unzip archive?'
-        defaultAction='confirm'
-        text={[
-          'This will unzip ',
-          { text: extractTarget?.name ?? 'this archive', bold: true },
-          ' into a new folder beside it.',
-        ]}
-        confirm={{
-          label: 'Unzip',
-          onClick: () => void handleExtract(),
-          variant: 'primary',
-          pending: extractFile.isPending,
-          pendingLabel: 'Unzipping...',
-          disabled: !canEdit,
-        }}
-      />
+      {extractTarget && (
+        <FileExtractionModal
+          key={extractTarget.id}
+          owner={{ entityType: 'workspace', entityId: workspaceId }}
+          fileId={extractTarget.id}
+          fileName={extractTarget.name}
+          canWrite={canEdit}
+          onClose={() => setExtractTargetId(null)}
+        />
+      )}
 
+      {browserModals}
       {shareModal}
 
       <input
diff --git a/apps/sim/app/workspace/[workspaceId]/files/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/files/hooks/index.ts
new file mode 100644
index 00000000000..11d9d36533b
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/hooks/index.ts
@@ -0,0 +1,3 @@
+export { useFileUploadDrop } from './use-file-upload-drop'
+export { useProjectFileUpload } from './use-project-file-upload'
+export { useWorkspaceFilesRoom } from './use-workspace-files-room'
diff --git a/apps/sim/app/workspace/[workspaceId]/files/hooks/use-file-upload-drop.ts b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-file-upload-drop.ts
new file mode 100644
index 00000000000..608a272437c
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-file-upload-drop.ts
@@ -0,0 +1,58 @@
+import { type DragEvent, useCallback, useRef, useState } from 'react'
+import { useDragTeardown } from '@/app/workspace/[workspaceId]/components/folders/use-drag-teardown'
+import { getDroppedFiles, hasExternalFiles } from '@/app/workspace/[workspaceId]/files/utils'
+
+interface UseFileUploadDropOptions {
+  enabled: boolean
+  onDrop: (files: File[]) => void
+}
+
+/** Owns the OS drag overlay independently of internal file-row moves. */
+export function useFileUploadDrop({ enabled, onDrop }: UseFileUploadDropOptions) {
+  const [isDraggingOver, setIsDraggingOver] = useState(false)
+  const dragCounter = useRef(0)
+  const dismiss = useCallback(() => {
+    dragCounter.current = 0
+    setIsDraggingOver(false)
+  }, [])
+  useDragTeardown(dismiss)
+
+  const onDragEnter = useCallback(
+    (event: DragEvent) => {
+      if (!hasExternalFiles(event.dataTransfer)) return
+      event.preventDefault()
+      if (!enabled) return
+      dragCounter.current++
+      setIsDraggingOver(true)
+    },
+    [enabled]
+  )
+  const onDragLeave = useCallback((event: DragEvent) => {
+    if (!hasExternalFiles(event.dataTransfer)) return
+    dragCounter.current = Math.max(0, dragCounter.current - 1)
+    if (dragCounter.current === 0) setIsDraggingOver(false)
+  }, [])
+  const onDragOver = useCallback(
+    (event: DragEvent) => {
+      if (!hasExternalFiles(event.dataTransfer)) return
+      event.preventDefault()
+      event.dataTransfer.dropEffect = enabled ? 'copy' : 'none'
+    },
+    [enabled]
+  )
+  const handleDrop = useCallback(
+    (event: DragEvent) => {
+      if (!hasExternalFiles(event.dataTransfer)) return
+      event.preventDefault()
+      dismiss()
+      if (enabled) onDrop(getDroppedFiles(event.dataTransfer))
+    },
+    [dismiss, enabled, onDrop]
+  )
+
+  return {
+    isDraggingOver: enabled && isDraggingOver,
+    dismiss,
+    handlers: { onDragEnter, onDragLeave, onDragOver, onDrop: handleDrop },
+  }
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.test.tsx b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.test.tsx
new file mode 100644
index 00000000000..37271b28acb
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.test.tsx
@@ -0,0 +1,65 @@
+/** @vitest-environment jsdom */
+
+import { act } from 'react'
+import { createDeferred } from '@sim/testing/helpers/deferred'
+import { nextNavigationMock } from '@sim/testing/mocks/next-navigation.mock'
+import { createRoot } from 'react-dom/client'
+import { expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({ mutateAsync: vi.fn() }))
+vi.mock('@/hooks/queries/project-files', () => ({
+  useUploadProjectFile: () => ({ mutateAsync: mocks.mutateAsync }),
+}))
+vi.mock('next/navigation', () => nextNavigationMock)
+
+import { useProjectFileUpload } from '@/app/workspace/[workspaceId]/files/hooks/use-project-file-upload'
+
+interface UploadProbeProps {
+  canWrite: boolean
+  onStart: (completion: Promise<void>) => void
+}
+
+function UploadProbe({ canWrite, onStart }: UploadProbeProps) {
+  const { uploadFiles } = useProjectFileUpload({ projectId: 'project-upload', canWrite })
+  return (
+    <button
+      type='button'
+      onClick={() => onStart(uploadFiles([new File(['draft'], 'notes.md')], null))}
+    >
+      Upload
+    </button>
+  )
+}
+
+it('aborts the current upload when Project write access is revoked', async () => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  const pending = createDeferred<void>()
+  const started = createDeferred<AbortSignal>()
+  mocks.mutateAsync.mockImplementation(({ signal }: { signal: AbortSignal }) => {
+    started.resolve(signal)
+    return pending.promise
+  })
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const root = createRoot(container)
+  let completion: Promise<void> | undefined
+  const onStart = (upload: Promise<void>) => {
+    completion = upload
+  }
+  try {
+    act(() => root.render(<UploadProbe canWrite onStart={onStart} />))
+    act(() => container.querySelector('button')?.click())
+    const signal = await started.promise
+    expect(signal.aborted).toBe(false)
+
+    act(() => root.render(<UploadProbe canWrite={false} onStart={onStart} />))
+    expect(signal.aborted).toBe(true)
+  } finally {
+    await act(async () => {
+      pending.resolve()
+      await completion
+    })
+    act(() => root.unmount())
+    container.remove()
+  }
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.ts b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.ts
new file mode 100644
index 00000000000..d542ee4cb5f
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-project-file-upload.ts
@@ -0,0 +1,94 @@
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { toast } from '@sim/emcn'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useLimitUpgradeToast } from '@/lib/billing/client'
+import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types'
+import { useUploadProjectFile } from '@/hooks/queries/project-files'
+
+interface UploadProgress {
+  completed: number
+  total: number
+  currentPercent: number
+  folderId: string | null
+}
+
+interface UseProjectFileUploadProps {
+  projectId: string
+  canWrite: boolean
+}
+
+/** Captures the upload destination for a batch and retires it when its owner view unmounts. */
+export function useProjectFileUpload({ projectId, canWrite }: UseProjectFileUploadProps) {
+  const { mutateAsync } = useUploadProjectFile()
+  const notifyLimit = useLimitUpgradeToast()
+  const active = useRef<AbortController | null>(null)
+  const canWriteRef = useRef(canWrite)
+  canWriteRef.current = canWrite
+  const [progress, setProgress] = useState<UploadProgress | null>(null)
+
+  useEffect(
+    () => () => {
+      active.current?.abort()
+      active.current = null
+    },
+    []
+  )
+
+  useEffect(() => {
+    if (!canWrite) active.current?.abort()
+  }, [canWrite])
+
+  const uploadFiles = useCallback(
+    async (files: File[], folderId: string | null) => {
+      if (!canWriteRef.current || active.current || files.length === 0) return
+      const allowed: File[] = []
+      for (const file of files) {
+        if (file.size > MAX_WORKSPACE_FILE_SIZE) {
+          toast.error(`${file.name} exceeds the 5 GiB upload limit`)
+        } else {
+          allowed.push(file)
+        }
+      }
+      if (allowed.length === 0) return
+      const controller = new AbortController()
+      active.current = controller
+      const updateProgress = (completed: number, currentPercent: number) => {
+        if (active.current === controller && !controller.signal.aborted) {
+          setProgress({ completed, currentPercent, total: allowed.length, folderId })
+        }
+      }
+      updateProgress(0, 0)
+      try {
+        for (const [index, file] of allowed.entries()) {
+          if (controller.signal.aborted || !canWriteRef.current) break
+          try {
+            await mutateAsync({
+              projectId,
+              folderId,
+              file,
+              signal: controller.signal,
+              onProgress: ({ percent }) => updateProgress(index, percent),
+            })
+          } catch (error) {
+            if (controller.signal.aborted) break
+            const message = getErrorMessage(error, `Unable to upload ${file.name}`)
+            if (/storage limit/i.test(message)) notifyLimit('storage', message)
+            else toast.error(message)
+          }
+          updateProgress(index + 1, 0)
+        }
+      } finally {
+        if (active.current === controller) {
+          active.current = null
+          setProgress(null)
+        }
+      }
+    },
+    [projectId, mutateAsync, notifyLimit]
+  )
+
+  const label = progress
+    ? `${progress.completed}/${progress.total}${progress.currentPercent > 0 && progress.currentPercent < 100 ? ` · ${progress.currentPercent}%` : ''}`
+    : 'Upload'
+  return { uploadFiles, progress, label, uploading: progress !== null }
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts
index 82e9a0bd107..4a44ed1150c 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/hooks/use-workspace-files-room.ts
@@ -1,28 +1,10 @@
 'use client'
 
-import { ROOM_TYPES } from '@sim/realtime-protocol/rooms'
-import { useQueryClient } from '@tanstack/react-query'
-import { useWorkspaceInvalidationRoom } from '@/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room'
-import { dashboardKeys } from '@/hooks/queries/dashboards'
-import {
-  invalidateWorkspaceFileBrowsers,
-  WORKSPACE_FILE_BROWSER_INVALIDATION_KEY,
-} from '@/hooks/queries/workspace-file-folders'
+import { useFileListRoom } from '@/hooks/use-file-list-room'
 
-/**
- * Keeps the file browser live: joins the workspace-files room so a `workspace-files-changed`
- * broadcast (fanned out by the file mutation API) invalidates the browser queries and every viewer
- * refetches without waiting for staleness. Thin binding over {@link useWorkspaceInvalidationRoom}.
- */
+/** Workspace callers share the owner-aware list controller without changing their room identity. */
 export function useWorkspaceFilesRoom(workspaceId: string): void {
-  const queryClient = useQueryClient()
-  useWorkspaceInvalidationRoom(
-    workspaceId,
-    ROOM_TYPES.WORKSPACE_FILES,
-    () => {
-      invalidateWorkspaceFileBrowsers(queryClient, workspaceId)
-      void queryClient.invalidateQueries({ queryKey: dashboardKeys.workspace(workspaceId) })
-    },
-    WORKSPACE_FILE_BROWSER_INVALIDATION_KEY
-  )
+  useFileListRoom({
+    owner: workspaceId ? { entityType: 'workspace', entityId: workspaceId } : null,
+  })
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/files/page.tsx b/apps/sim/app/workspace/[workspaceId]/files/page.tsx
index 11dc9fd450e..c704bf204fb 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/page.tsx
@@ -2,8 +2,9 @@ import { Suspense } from 'react'
 import { dehydrate, HydrationBoundary } from '@tanstack/react-query'
 import type { Metadata } from 'next'
 import { getSession } from '@/lib/auth'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
-import { Files } from '@/app/workspace/[workspaceId]/files/files'
+import { FilesBrowser } from '@/app/workspace/[workspaceId]/files/browser'
 import FilesLoading from '@/app/workspace/[workspaceId]/files/loading'
 import { prefetchFilesBrowser } from '@/app/workspace/[workspaceId]/files/prefetch'
 
@@ -28,7 +29,7 @@ export default async function FilesPage({ params }: { params: Promise<{ workspac
   return (
     <HydrationBoundary state={dehydrate(queryClient)}>
       <Suspense fallback={<FilesLoading />}>
-        <Files />
+        <FilesBrowser projectFilesEnabled={await isProjectFileApiEnabled()} />
       </Suspense>
     </HydrationBoundary>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/files/project-files.tsx b/apps/sim/app/workspace/[workspaceId]/files/project-files.tsx
new file mode 100644
index 00000000000..0465c21e339
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/project-files.tsx
@@ -0,0 +1,821 @@
+'use client'
+
+import { useMemo, useRef, useState } from 'react'
+import { Avatar, Chip, toast } from '@sim/emcn'
+import {
+  Clock,
+  Download,
+  Duplicate,
+  Folder,
+  FolderPlus,
+  Pencil,
+  Plus,
+  Send,
+  Trash,
+  Upload,
+} from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useParams, useRouter } from 'next/navigation'
+import { useQueryStates } from 'nuqs'
+import { getDocumentIcon } from '@/components/icons/document-icons'
+import type { FileCopySource } from '@/lib/api/contracts/file-copy-input'
+import type { Project } from '@/lib/api/contracts/projects'
+import { triggerArchiveDownload, triggerProjectFileDownload } from '@/lib/uploads/client/download'
+import { formatFileSize, isArchiveFileName } from '@/lib/uploads/utils/file-utils'
+import {
+  FILE_BROWSER_COLUMNS,
+  FILE_BROWSER_SIZES,
+  FILE_BROWSER_SORT_OPTIONS,
+  FILE_BROWSER_TYPES,
+  FILE_ROW_DRAG_MIME,
+} from '@/lib/workspace-files/browser'
+import { MAX_WORKSPACE_FILE_BULK_REQUEST_IDS } from '@/lib/workspace-files/limits'
+import {
+  buildDescendantIndex,
+  buildMoveOptionsExcludingSubtrees,
+  parseFolderedRowId,
+  parseMoveOptionValue,
+  splitFolderedRowIds,
+  useFolderRowDragDrop,
+} from '@/app/workspace/[workspaceId]/components/folders'
+import { ResourceActionBar } from '@/app/workspace/[workspaceId]/components/resource/components/action-bar'
+import type {
+  BreadcrumbItem,
+  ResourceAction,
+} from '@/app/workspace/[workspaceId]/components/resource/components/resource-header'
+import { timeCell } from '@/app/workspace/[workspaceId]/components/resource/components/time-cell'
+import {
+  Resource,
+  type ResourceColumn,
+  type ResourceRow,
+} from '@/app/workspace/[workspaceId]/components/resource/resource'
+import { useResourceRowSelection } from '@/app/workspace/[workspaceId]/components/resource/use-resource-row-selection'
+import { DeleteConfirmModal } from '@/app/workspace/[workspaceId]/files/components/delete-confirm-modal'
+import { FileCopyModal } from '@/app/workspace/[workspaceId]/files/components/file-copy-modal'
+import {
+  FileDetail,
+  useFileNavigation,
+} from '@/app/workspace/[workspaceId]/files/components/file-detail'
+import { FileExtractionModal } from '@/app/workspace/[workspaceId]/files/components/file-extraction-modal'
+import { FileFilterControls } from '@/app/workspace/[workspaceId]/files/components/file-filter-controls'
+import { FileHistoryModal } from '@/app/workspace/[workspaceId]/files/components/file-history-modal'
+import { FileRowContextMenu } from '@/app/workspace/[workspaceId]/files/components/file-row-context-menu'
+import { FileUploadOverlay } from '@/app/workspace/[workspaceId]/files/components/file-upload-overlay'
+import { ShareModal } from '@/app/workspace/[workspaceId]/files/components/share-modal'
+import { useFileUploadDrop, useProjectFileUpload } from '@/app/workspace/[workspaceId]/files/hooks'
+import FilesLoading from '@/app/workspace/[workspaceId]/files/loading'
+import {
+  filesFilterUrlKeys,
+  filesParsers,
+  filesSortParams,
+  filesUrlKeys,
+  projectFileFilterParsers,
+  projectFilesScopeParsers,
+  serializeProjectFilesLocation,
+} from '@/app/workspace/[workspaceId]/files/search-params'
+import { getDroppedFiles, hasExternalFiles } from '@/app/workspace/[workspaceId]/files/utils'
+import {
+  useArchiveProjectFileItems,
+  useCreateProjectFile,
+  useCreateProjectFileFolder,
+  useMoveProjectFileItems,
+  useProjectFile,
+  useProjectFileFolders,
+  useProjectFiles,
+  useRenameProjectFile,
+  useRestoreProjectFileItems,
+  useUpdateProjectFileFolder,
+} from '@/hooks/queries/project-files'
+import { useContextMenu } from '@/hooks/use-context-menu'
+import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
+import { useFileListRoom } from '@/hooks/use-file-list-room'
+import { useInlineRename } from '@/hooks/use-inline-rename'
+import { useSearchFilterValue } from '@/hooks/use-search-filter-value'
+import { useUrlSort } from '@/hooks/use-url-sort'
+
+const FILES_SEARCH_DEBOUNCE_MS = 200
+const COLUMNS: ResourceColumn[] = [...FILE_BROWSER_COLUMNS]
+
+interface ProjectFilesProps {
+  project: Project
+  workspaceId: string
+}
+
+export function ProjectFiles(props: ProjectFilesProps) {
+  const [{ scope }] = useQueryStates(projectFilesScopeParsers)
+  return <ProjectFilesContent key={`${props.project.id}:${scope}`} {...props} />
+}
+
+function ProjectFilesContent({ project, workspaceId }: ProjectFilesProps) {
+  useFileListRoom({ owner: { entityType: 'project', entityId: project.id } })
+  const uploadInput = useRef<HTMLInputElement>(null)
+  const downloadInFlight = useRef(false)
+  const navigation = useFileNavigation({ owner: { entityType: 'project', entityId: project.id } })
+  const [isDownloading, setIsDownloading] = useState(false)
+  const [extractTarget, setExtractTarget] = useState<{ id: string; name: string } | null>(null)
+  const [contextRowId, setContextRowId] = useState<string | null>(null)
+  const [deleteTarget, setDeleteTarget] = useState<{
+    fileIds: string[]
+    folderIds: string[]
+    name?: string
+  } | null>(null)
+  const router = useRouter()
+  const { fileId } = useParams<{ fileId?: string }>()
+  const [{ folderId, shareFileId, historyFileId }, setNavigation] = useQueryStates(
+    filesParsers,
+    filesUrlKeys
+  )
+  const [{ search, type: types, size: sizes, uploadedBy: creatorIds }, setFilters] = useQueryStates(
+    projectFileFilterParsers,
+    filesFilterUrlKeys
+  )
+  const sort = useUrlSort(filesSortParams, filesFilterUrlKeys)
+  const [{ scope }, setScope] = useQueryStates(projectFilesScopeParsers)
+  const archived = scope === 'archived'
+  const searchFilter = useSearchFilterValue(search, FILES_SEARCH_DEBOUNCE_MS)
+  const list = useProjectFiles(project.id, {
+    scope,
+    folderId: searchFilter || archived ? undefined : (folderId ?? undefined),
+    search: searchFilter || undefined,
+    types,
+    sizes,
+    creatorIds,
+    sortBy: sort.sort,
+    sortOrder: sort.dir,
+    limit: 100,
+  })
+  const folders = useProjectFileFolders(project.id, scope)
+  const detail = useProjectFile(project.id, fileId)
+  const historyFile = useProjectFile(project.id, historyFileId ?? undefined)
+  const sharedFile = useProjectFile(project.id, shareFileId ?? undefined)
+  const [copySource, setCopySource] = useState<FileCopySource | null>(null)
+  const createFile = useCreateProjectFile(project.id)
+  const createFolder = useCreateProjectFileFolder(project.id)
+  const renameFile = useRenameProjectFile(project.id)
+  const updateFolder = useUpdateProjectFileFolder(project.id)
+  const moveItems = useMoveProjectFileItems(project.id)
+  const archiveItems = useArchiveProjectFileItems(project.id)
+  const restoreItems = useRestoreProjectFileItems(project.id)
+  const menu = useContextMenu()
+  const rename = useInlineRename({
+    onSave: async (id, name) => {
+      try {
+        return id.startsWith('folder:')
+          ? await updateFolder.mutateAsync({ folderId: id.slice('folder:'.length), body: { name } })
+          : await renameFile.mutateAsync({ fileId: id, name })
+      } catch (error) {
+        toast.error(getErrorMessage(error, 'Unable to rename this item'))
+        throw error
+      }
+    },
+  })
+  const file = detail.data?.file
+  const canWrite = file
+    ? detail.data?.capabilities.canWrite
+    : (list.data?.pages[0]?.capabilities.canWrite ?? folders.data?.capabilities.canWrite)
+  const upload = useProjectFileUpload({
+    projectId: project.id,
+    canWrite: Boolean(canWrite) && !archived,
+  })
+  const files = list.data?.pages.flatMap((page) => page.files) ?? []
+  const filesById = new Map(files.map((file) => [file.id, file]))
+  const items = list.data?.pages.flatMap((page) => page.items) ?? []
+  const creators = list.data?.pages[0]?.creators ?? []
+  const shareFile = sharedFile.isError ? undefined : sharedFile.data?.file
+  const allFolders = folders.data?.folders ?? []
+  const folderById = useMemo(
+    () => new Map(allFolders.map((folder) => [folder.id, folder])),
+    [allFolders]
+  )
+  const contextFolder = contextRowId?.startsWith('folder:')
+    ? folderById.get(contextRowId.slice('folder:'.length))
+    : undefined
+  const contextFile = contextFolder ? undefined : files.find((item) => item.id === contextRowId)
+  const contextItem = contextFolder
+    ? { kind: 'folder' as const, ...contextFolder }
+    : contextFile
+      ? { kind: 'file' as const, ...contextFile }
+      : null
+  const currentFolder = archived ? undefined : allFolders.find((folder) => folder.id === folderId)
+  const base = `/workspace/${encodeURIComponent(workspaceId)}/files`
+  const locationState = {
+    owner: 'project' as const,
+    projectId: project.id,
+    folderId,
+    search,
+    type: types,
+    size: sizes,
+    uploadedBy: creatorIds,
+    sort: sort.sort,
+    dir: sort.dir,
+    scope,
+  }
+  const searchSetter = useDebouncedSearchSetter(
+    (value, options) => {
+      void setFilters({ search: value }, options)
+    },
+    { debounceMs: FILES_SEARCH_DEBOUNCE_MS }
+  )
+
+  function navigateToFolder(nextFolderId: string | null) {
+    if (fileId) {
+      navigation.navigate(
+        serializeProjectFilesLocation(base, {
+          ...locationState,
+          folderId: nextFolderId,
+          search: '',
+        })
+      )
+      return
+    }
+    searchSetter('')
+    void setNavigation({ folderId: nextFolderId, new: null })
+  }
+
+  function openFile(id: string) {
+    const target = filesById.get(id)
+    if (target && isArchiveFileName(target.name) && canWrite && !archived) {
+      setExtractTarget({ id, name: target.name })
+      return
+    }
+    navigation.navigate(
+      serializeProjectFilesLocation(`${base}/${encodeURIComponent(id)}`, locationState)
+    )
+  }
+
+  function editing(id: string) {
+    return rename.editingId === id
+      ? {
+          isEditing: true,
+          value: rename.editValue,
+          onChange: rename.setEditValue,
+          onSubmit: () => void rename.submitRename(),
+          onCancel: rename.cancelRename,
+          disabled: rename.isSaving,
+        }
+      : undefined
+  }
+
+  async function moveItem(optionValue: string) {
+    if (!canWrite || archived || selectedRowIds.size === 0) return
+    try {
+      await moveItems.mutateAsync({
+        ...selectedItems,
+        targetFolderId: parseMoveOptionValue(optionValue),
+      })
+      clearSelection()
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to move this item'))
+    }
+  }
+
+  async function deleteItem() {
+    if (!deleteTarget) return
+    try {
+      await archiveItems.mutateAsync({
+        fileIds: deleteTarget.fileIds,
+        folderIds: deleteTarget.folderIds,
+      })
+      setDeleteTarget(null)
+      clearSelection()
+      if (fileId) router.push(serializeProjectFilesLocation(base, locationState))
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to delete this item'))
+    }
+  }
+
+  async function restoreItem(kind: 'file' | 'folder', id: string) {
+    try {
+      await restoreItems.mutateAsync({ kind, id })
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to restore this item'))
+    }
+  }
+
+  async function createDocument() {
+    try {
+      const result = await createFile.mutateAsync({
+        name: 'Untitled.md',
+        content: '',
+        contentType: 'text/markdown',
+        encoding: 'utf-8',
+        folderId: folderId ?? undefined,
+      })
+      openFile(result.file.id)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to create this document'))
+    }
+  }
+
+  async function addFolder() {
+    try {
+      const result = await createFolder.mutateAsync({ name: 'New Folder', parentId: folderId })
+      navigateToFolder(result.folder.id)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to create this folder'))
+    }
+  }
+
+  function uploadFiles(files: File[], targetFolderId: string | null = folderId) {
+    if (!canWrite || archived || upload.uploading) return
+    void setFilters({ search: '' })
+    void upload.uploadFiles(files, targetFolderId)
+  }
+
+  async function downloadFile() {
+    if (!file) return
+    try {
+      await triggerProjectFileDownload(file, navigation.downloadSourceRef.current)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to download this file'))
+    }
+  }
+
+  async function downloadSelection() {
+    if (
+      archived ||
+      downloadInFlight.current ||
+      selectedRowIds.size === 0 ||
+      selectedRowIds.size > MAX_WORKSPACE_FILE_BULK_REQUEST_IDS
+    ) {
+      return
+    }
+    downloadInFlight.current = true
+    setIsDownloading(true)
+    try {
+      const singleFile =
+        selectedItems.folderIds.length === 0 && selectedItems.fileIds.length === 1
+          ? files.find((item) => item.id === selectedItems.fileIds[0])
+          : undefined
+      if (singleFile) {
+        await triggerProjectFileDownload(singleFile)
+      } else {
+        await triggerArchiveDownload({
+          owner: { entityType: 'project', entityId: project.id },
+          ...selectedItems,
+        })
+      }
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to download the selected files'))
+    } finally {
+      downloadInFlight.current = false
+      setIsDownloading(false)
+    }
+  }
+
+  const breadcrumbs: BreadcrumbItem[] = [
+    { label: project.name, onClick: () => navigateToFolder(null) },
+    { label: 'Files', folderId: null, onClick: () => navigateToFolder(null) },
+  ]
+  const ancestors: BreadcrumbItem[] = []
+  const visited = new Set<string>()
+  let ancestor = file?.folderId ? folderById.get(file.folderId) : currentFolder
+  while (ancestor && !visited.has(ancestor.id)) {
+    const id = ancestor.id
+    visited.add(id)
+    ancestors.unshift({
+      label: ancestor.name,
+      folderId: id,
+      onClick: () => navigateToFolder(id),
+    })
+    ancestor = ancestor.parentId ? folderById.get(ancestor.parentId) : undefined
+  }
+  breadcrumbs.push(...ancestors)
+  if (file) breadcrumbs.push({ label: file.name, editing: editing(file.id) })
+  const actions: ResourceAction[] = file
+    ? [
+        { id: 'download', text: 'Download', icon: Download, onSelect: () => void downloadFile() },
+        {
+          id: 'history',
+          text: 'Version History',
+          icon: Clock,
+          onSelect: () => void setNavigation({ historyFileId: file.id }, { history: 'replace' }),
+        },
+        {
+          id: 'copy',
+          text: 'Copy to...',
+          icon: Duplicate,
+          onSelect: () => setCopySource({ owner: file.owner, fileIds: [file.id], folderIds: [] }),
+        },
+        ...(canWrite
+          ? [
+              {
+                id: 'rename',
+                text: 'Rename',
+                icon: Pencil,
+                onSelect: () => rename.startRename(file.id, file.name),
+              },
+              {
+                id: 'share',
+                text: 'Share',
+                icon: Send,
+                onSelect: () =>
+                  void setNavigation({ shareFileId: file.id }, { history: 'replace' }),
+              },
+              {
+                id: 'delete',
+                text: 'Delete',
+                icon: Trash,
+                onSelect: () =>
+                  setDeleteTarget({ fileIds: [file.id], folderIds: [], name: file.name }),
+              },
+            ]
+          : []),
+      ]
+    : [
+        {
+          id: 'upload',
+          text: upload.label,
+          icon: Upload,
+          onSelect: () => uploadInput.current?.click(),
+          disabled: archived || !canWrite || upload.uploading,
+        },
+        {
+          id: 'create',
+          text: 'New file',
+          icon: Plus,
+          onSelect: () => void createDocument(),
+          disabled: archived || !canWrite || createFile.isPending || upload.uploading,
+        },
+        {
+          id: 'folder',
+          text: 'New folder',
+          icon: FolderPlus,
+          onSelect: () => void addFolder(),
+          disabled: archived || !canWrite || createFolder.isPending,
+        },
+      ]
+  const rows: ResourceRow[] = items.map((item) => {
+    const rowId = item.kind === 'folder' ? `folder:${item.id}` : item.id
+    const file = item.kind === 'file' ? filesById.get(item.id) : undefined
+    const Icon = file ? getDocumentIcon(file.type, file.name) : Folder
+    return {
+      id: rowId,
+      cells: {
+        name: { label: item.name, icon: <Icon className='size-[14px]' />, editing: editing(rowId) },
+        size: { label: formatFileSize(item.size, { includeBytes: true }) },
+        type: { label: item.type, icon: <Icon className='size-[14px]' /> },
+        created: timeCell(item.createdAt),
+        owner: {
+          label: item.creator?.name ?? 'Deleted user',
+          icon: item.creator ? (
+            <Avatar size='xs' name={item.creator.name} src={item.creator.image} aria-hidden />
+          ) : undefined,
+        },
+        updated: timeCell(item.updatedAt),
+        restore: {
+          content: canWrite && (
+            <Chip
+              disabled={restoreItems.isPending}
+              onClick={() => void restoreItem(item.kind, item.id)}
+            >
+              Restore
+            </Chip>
+          ),
+        },
+      },
+    }
+  })
+
+  const visibleRowIds = useMemo(
+    () =>
+      list.data?.pages.flatMap((page) =>
+        page.items.map((item) => (item.kind === 'folder' ? `folder:${item.id}` : item.id))
+      ) ?? [],
+    [list.data?.pages]
+  )
+  const { selectedRowIds, selectable, clearSelection, replaceSelection } = useResourceRowSelection({
+    visibleRowIds,
+    isKeyboardBlocked: () => Boolean(fileId || rename.editingId || deleteTarget || archived),
+    onDeleteSelected: canWrite ? () => setDeleteTarget(selectedItems) : undefined,
+  })
+  const selectedItems = useMemo(() => {
+    const { resourceIds, folderIds } = splitFolderedRowIds(selectedRowIds)
+    return { fileIds: resourceIds, folderIds }
+  }, [selectedRowIds])
+  const moveOptions = buildMoveOptionsExcludingSubtrees({
+    folders: allFolders,
+    rootLabel: 'Project files',
+    excludeFolderIds: selectedItems.folderIds,
+    descendantsByFolderId: buildDescendantIndex(allFolders),
+  })
+
+  const rowDragDrop = useFolderRowDragDrop({
+    dragMime: FILE_ROW_DRAG_MIME,
+    owner: { entityType: 'project', entityId: project.id },
+    canEdit: Boolean(canWrite) && !archived && !upload.uploading && !moveItems.isPending,
+    editingRowId: rename.editingId,
+    descendantsByFolderId: buildDescendantIndex(allFolders),
+    getFolderParentId: (id) => folderById.get(id)?.parentId,
+    getResourceFolderId: (id) => filesById.get(id)?.folderId,
+    getRowLabel: (rowId) => {
+      const row = parseFolderedRowId(rowId)
+      return row.kind === 'folder'
+        ? (folderById.get(row.id)?.name ?? 'Folder')
+        : (filesById.get(row.id)?.name ?? 'File')
+    },
+    onMoveRows: ({ folderIds, resourceIds }, targetFolderId) => {
+      void moveItems
+        .mutateAsync({ folderIds, fileIds: resourceIds, targetFolderId })
+        .then(() => clearSelection())
+        .catch((error) => toast.error(getErrorMessage(error, 'Unable to move the selected files')))
+    },
+    selection: { selectedRowIds, visibleRowIds, replaceSelection },
+    onSpringOpenFolder: (folderId, options) => void setNavigation({ folderId }, options),
+    currentFolderId: folderId,
+    bodyDropFolderId: searchFilter ? undefined : folderId,
+    externalDrop: {
+      matches: hasExternalFiles,
+      onDropIntoFolder: (dataTransfer, targetFolderId) => {
+        uploadDrop.dismiss()
+        uploadFiles(getDroppedFiles(dataTransfer), targetFolderId)
+      },
+    },
+  })
+  const uploadDrop = useFileUploadDrop({
+    enabled: Boolean(canWrite) && !archived && !fileId && !upload.uploading,
+    onDrop: (files) => {
+      rowDragDrop.externalDropHandled()
+      uploadFiles(files)
+    },
+  })
+
+  if (fileId && detail.isPending) return <FilesLoading />
+  const error = fileId ? detail.error : (list.error ?? folders.error)
+  if (error || (fileId && !file)) {
+    return (
+      <div role='status' className='p-6 text-small'>
+        {getErrorMessage(error, 'This Project file is unavailable')}
+      </div>
+    )
+  }
+
+  return (
+    <div className='relative flex h-full flex-col overflow-hidden' {...uploadDrop.handlers}>
+      {file ? (
+        <FileDetail
+          key={file.id}
+          header={{ breadcrumbs, actions }}
+          showSaveAction
+          viewer={{
+            owner: file.owner,
+            file,
+            canEdit: Boolean(canWrite),
+            collaborative: true,
+            enableFind: true,
+          }}
+        />
+      ) : (
+        <Resource>
+          <Resource.Header
+            breadcrumbs={breadcrumbs}
+            actions={actions}
+            breadcrumbDrop={rowDragDrop.breadcrumb}
+          />
+          <Resource.Options
+            search={{ value: search, onChange: searchSetter, placeholder: 'Search files' }}
+            sort={{
+              options: [...FILE_BROWSER_SORT_OPTIONS],
+              active: sort.activeSort,
+              onSort: sort.onSort,
+              onClear: sort.onClear,
+            }}
+            filter={{
+              content: (
+                <FileFilterControls
+                  types={types}
+                  sizes={sizes}
+                  creatorIds={creatorIds}
+                  creators={creators.map((creator) => ({
+                    value: creator.id,
+                    label: creator.name,
+                    iconElement: (
+                      <Avatar size='xs' name={creator.name} src={creator.image} aria-hidden />
+                    ),
+                  }))}
+                  onTypes={(values) =>
+                    void setFilters({
+                      type: FILE_BROWSER_TYPES.filter((type) => values.includes(type)),
+                    })
+                  }
+                  onSizes={(values) =>
+                    void setFilters({
+                      size: FILE_BROWSER_SIZES.filter((size) => values.includes(size)),
+                    })
+                  }
+                  onCreators={(values) => void setFilters({ uploadedBy: values })}
+                  onClear={() => void setFilters({ type: [], size: [], uploadedBy: [] })}
+                />
+              ),
+            }}
+            filterTags={[
+              ...(types.length
+                ? [
+                    {
+                      label: `Type: ${types.join(', ')}`,
+                      onRemove: () => void setFilters({ type: [] }),
+                    },
+                  ]
+                : []),
+              ...(sizes.length
+                ? [
+                    {
+                      label: `Size: ${sizes.join(', ')}`,
+                      onRemove: () => void setFilters({ size: [] }),
+                    },
+                  ]
+                : []),
+              ...(creatorIds.length
+                ? [
+                    {
+                      label: `Uploaded by: ${creatorIds.length} selected`,
+                      onRemove: () => void setFilters({ uploadedBy: [] }),
+                    },
+                  ]
+                : []),
+            ]}
+            aside={
+              <Chip
+                active={archived}
+                onClick={() => void setScope({ scope: archived ? 'active' : 'archived' })}
+              >
+                Recently Deleted
+              </Chip>
+            }
+          />
+          {upload.progress && (
+            <p role='status' className='px-6 py-2 text-[var(--text-muted)] text-small'>
+              Uploading to{' '}
+              {upload.progress.folderId
+                ? (folderById.get(upload.progress.folderId)?.name ?? 'the selected folder')
+                : project.name}
+            </p>
+          )}
+          <Resource.Table
+            rowDragDrop={rowDragDrop}
+            overlay={
+              uploadDrop.isDraggingOver ? (
+                <FileUploadOverlay destination={currentFolder?.name ?? project.name} />
+              ) : undefined
+            }
+            columns={archived ? [...COLUMNS, { id: 'restore', header: '' }] : COLUMNS}
+            rows={rows}
+            selectable={
+              !archived ? { ...selectable, selectAllLabel: 'Select loaded rows' } : undefined
+            }
+            onRowClick={(id) =>
+              archived
+                ? undefined
+                : id.startsWith('folder:')
+                  ? navigateToFolder(id.slice('folder:'.length))
+                  : openFile(id)
+            }
+            onRowContextMenu={
+              archived
+                ? undefined
+                : (event, id) => {
+                    setContextRowId(id)
+                    if (!selectedRowIds.has(id)) replaceSelection([id])
+                    menu.handleContextMenu(event)
+                  }
+            }
+            onLoadMore={() => void list.fetchNextPage()}
+            hasMore={list.hasNextPage}
+            isLoadingMore={list.isFetchingNextPage}
+            emptyState={
+              <p className='p-6 text-[var(--text-muted)] text-small'>
+                {list.isPending
+                  ? 'Loading files...'
+                  : search || types.length || sizes.length || creatorIds.length
+                    ? 'No matching files'
+                    : 'No files in this folder'}
+              </p>
+            }
+          />
+          {list.hasNextPage && !archived && (
+            <p className='px-6 py-2 text-[var(--text-muted)] text-small'>
+              Selection includes loaded rows only.
+            </p>
+          )}
+          {!archived && (
+            <ResourceActionBar
+              selectedCount={selectedRowIds.size}
+              onDownload={() => void downloadSelection()}
+              onCopy={() =>
+                setCopySource({
+                  owner: { entityType: 'project', entityId: project.id },
+                  ...selectedItems,
+                })
+              }
+              onMove={canWrite ? (value) => void moveItem(value) : undefined}
+              moveOptions={moveOptions}
+              onDelete={canWrite ? () => setDeleteTarget(selectedItems) : undefined}
+              isLoading={isDownloading || moveItems.isPending || archiveItems.isPending}
+              maxSelectable={MAX_WORKSPACE_FILE_BULK_REQUEST_IDS}
+            />
+          )}
+        </Resource>
+      )}
+      <input
+        ref={uploadInput}
+        type='file'
+        multiple
+        className='hidden'
+        aria-label='Upload Project files'
+        disabled={!canWrite || archived || upload.uploading}
+        onChange={(event) => {
+          uploadFiles(Array.from(event.target.files ?? []))
+          event.target.value = ''
+        }}
+      />
+      <FileRowContextMenu
+        isOpen={menu.isOpen && Boolean(contextItem)}
+        position={menu.position}
+        onClose={menu.closeMenu}
+        onOpen={() => {
+          if (contextItem?.kind === 'folder') navigateToFolder(contextItem.id)
+          else if (contextItem) openFile(contextItem.id)
+        }}
+        onShare={
+          contextFile && !archived
+            ? () => void setNavigation({ shareFileId: contextFile.id }, { history: 'replace' })
+            : undefined
+        }
+        onCopy={() => {
+          setCopySource({
+            owner: { entityType: 'project', entityId: project.id },
+            ...selectedItems,
+          })
+          menu.closeMenu()
+        }}
+        onHistory={
+          contextFile
+            ? () => {
+                void setNavigation({ historyFileId: contextFile.id }, { history: 'replace' })
+                menu.closeMenu()
+              }
+            : undefined
+        }
+        onDownload={() => void downloadSelection()}
+        onRename={() => {
+          if (contextRowId && contextItem) rename.startRename(contextRowId, contextItem.name)
+        }}
+        onDelete={() => {
+          if (contextItem)
+            setDeleteTarget({
+              ...selectedItems,
+              name: selectedRowIds.size === 1 ? contextItem.name : undefined,
+            })
+        }}
+        onMove={(value) => void moveItem(value)}
+        moveOptions={moveOptions}
+        pinned={false}
+        canEdit={Boolean(canWrite)}
+        selectedCount={selectedRowIds.size}
+      />
+      {shareFile && !archived && (
+        <ShareModal
+          open
+          owner={{ entityType: 'project', entityId: project.id }}
+          fileId={shareFile.id}
+          fileName={shareFile.name}
+          onOpenChange={(open) => {
+            if (!open) void setNavigation({ shareFileId: null }, { history: 'replace' })
+          }}
+        />
+      )}
+      {historyFileId && historyFile.data && !archived && (
+        <FileHistoryModal
+          key={`${project.id}:${historyFileId}`}
+          owner={historyFile.data.file.owner}
+          fileId={historyFileId}
+          fileName={historyFile.data.file.name}
+          canWrite={historyFile.data.capabilities.canWrite}
+          onClose={() => void setNavigation({ historyFileId: null }, { history: 'replace' })}
+        />
+      )}
+      {extractTarget && !archived && (
+        <FileExtractionModal
+          key={extractTarget.id}
+          owner={{ entityType: 'project', entityId: project.id }}
+          fileId={extractTarget.id}
+          fileName={extractTarget.name}
+          canWrite={Boolean(canWrite)}
+          onClose={() => setExtractTarget(null)}
+        />
+      )}
+      {copySource && <FileCopyModal source={copySource} onClose={() => setCopySource(null)} />}
+      <DeleteConfirmModal
+        open={Boolean(deleteTarget)}
+        onOpenChange={(open) => {
+          if (!open) setDeleteTarget(null)
+        }}
+        fileName={deleteTarget?.name}
+        fileCount={deleteTarget?.fileIds.length ?? 0}
+        folderCount={deleteTarget?.folderIds.length ?? 0}
+        onDelete={() => void deleteItem()}
+        isPending={archiveItems.isPending}
+      />
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/files/search-params.ts b/apps/sim/app/workspace/[workspaceId]/files/search-params.ts
index 0e601c15859..c3e2267a96e 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/search-params.ts
+++ b/apps/sim/app/workspace/[workspaceId]/files/search-params.ts
@@ -1,9 +1,20 @@
-import { createParser, parseAsArrayOf, parseAsString } from 'nuqs/server'
+import {
+  createParser,
+  createSerializer,
+  parseAsArrayOf,
+  parseAsString,
+  parseAsStringLiteral,
+} from 'nuqs/server'
 import { createSortParams } from '@/lib/url-state'
+import {
+  FILE_BROWSER_SIZES,
+  FILE_BROWSER_SORTS,
+  FILE_BROWSER_TYPES,
+} from '@/lib/workspace-files/browser'
 import type { ResourceListPreferenceConfig } from '@/stores/resource-list-preferences'
 
 /** Sortable list columns, matching the `Resource.Options` sort menu. */
-export const FILE_SORT_COLUMNS = ['name', 'size', 'type', 'created', 'owner', 'updated'] as const
+export const FILE_SORT_COLUMNS = FILE_BROWSER_SORTS
 
 /**
  * Parser for the `new` flag. Preserves the prior `?new=1` wire format on
@@ -39,6 +50,17 @@ export const filesParsers = {
   folderId: parseAsString,
   new: parseAsNewFlag.withDefault(false),
   shareFileId: parseAsString,
+  historyFileId: parseAsString,
+} as const
+
+/** Legacy file links open the environment; Project links assert their canonical owner. */
+export const fileOwnerParsers = {
+  owner: parseAsStringLiteral(['workspace', 'project'] as const).withDefault('workspace'),
+  projectId: parseAsString.withDefault(''),
+} as const
+
+export const projectFilesScopeParsers = {
+  scope: parseAsStringLiteral(['active', 'archived'] as const).withDefault('active'),
 } as const
 
 /**
@@ -103,3 +125,21 @@ export const filesFilterUrlKeys = {
   clearOnDefault: true,
   urlKeys: filesFilterUrlKeyMap,
 } as const
+
+/** Project filtering is applied to the complete server collection before its cursor. */
+export const projectFileFilterParsers = {
+  ...filesFilterParsers,
+  type: parseAsArrayOf(parseAsStringLiteral(FILE_BROWSER_TYPES)).withDefault([]),
+  size: parseAsArrayOf(parseAsStringLiteral(FILE_BROWSER_SIZES)).withDefault([]),
+} as const
+
+export const serializeProjectFilesLocation = createSerializer(
+  {
+    ...filesParsers,
+    ...fileOwnerParsers,
+    ...projectFileFilterParsers,
+    ...filesSortParams.parsers,
+    ...projectFilesScopeParsers,
+  },
+  { urlKeys: filesFilterUrlKeyMap }
+)
diff --git a/apps/sim/app/workspace/[workspaceId]/files/utils/index.ts b/apps/sim/app/workspace/[workspaceId]/files/utils/index.ts
new file mode 100644
index 00000000000..084a5a82c16
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/utils/index.ts
@@ -0,0 +1,4 @@
+export {
+  getDroppedFiles,
+  hasExternalFiles,
+} from '@/app/workspace/[workspaceId]/files/utils/uploads'
diff --git a/apps/sim/app/workspace/[workspaceId]/files/utils/uploads.ts b/apps/sim/app/workspace/[workspaceId]/files/utils/uploads.ts
new file mode 100644
index 00000000000..f6732c1ecae
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/files/utils/uploads.ts
@@ -0,0 +1,23 @@
+import { toast } from '@sim/emcn'
+
+export const hasExternalFiles = (dataTransfer: DataTransfer): boolean =>
+  dataTransfer.types.includes('Files')
+
+/** Rejects directory drops while retaining arbitrary file uploads. */
+export function getDroppedFiles(dataTransfer: DataTransfer): File[] {
+  if (dataTransfer.items.length === 0) return Array.from(dataTransfer.files)
+  const files: File[] = []
+  for (const item of Array.from(dataTransfer.items)) {
+    if (item.kind !== 'file') continue
+    const entry = item.webkitGetAsEntry?.()
+    if (entry?.isDirectory) {
+      toast.error(`Cannot upload the folder "${entry.name}"`, {
+        description: 'Create a folder in Files, then upload the files inside it.',
+      })
+      continue
+    }
+    const file = item.getAsFile()
+    if (file) files.push(file)
+  }
+  return files
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
index 80ca0db6ef1..d7f59e60af6 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/chat-context-kind-registry/chat-context-kind-registry.tsx
@@ -108,6 +108,10 @@ export const CHAT_CONTEXT_KIND_REGISTRY: Record<ChatContextKind, ChatContextKind
     label: 'File folder',
     renderIcon: ({ className }) => <FolderIcon className={className} />,
   },
+  project: {
+    label: 'Project',
+    renderIcon: ({ className }) => <FolderIcon className={className} />,
+  },
   workspace: {
     label: 'Workspace',
     renderIcon: ({ className }) => <Workspaces className={className} />,
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 4c36f4083ae..0d2abaf7cd0 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
@@ -108,7 +108,11 @@ vi.mock('@/lib/browser-agent/transport', () => ({
 import { toast } from '@sim/emcn'
 import type { GenericSecretSource } from '@/lib/api/contracts/organization-secrets'
 import type { CredentialItemData } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags'
-import { SpecialTags } from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags'
+import {
+  SpecialTags,
+  WorkspaceResourceDisplay,
+} from '@/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { organizationSecretKeys } from '@/hooks/queries/organization-secrets'
 
 const mockOrganizationContext = organizationProviderMockFns.mockUseOptionalOrganizationContext
@@ -459,3 +463,62 @@ describe('CredentialDisplay link tag', () => {
     act(() => root.unmount())
   })
 })
+
+describe('restored Project file mentions', () => {
+  it.each([
+    [false, true],
+    [true, false],
+    [false, false],
+  ])('stops metadata reads after rollout flags become %s/%s', async (projects, projectFiles) => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+    vi.useFakeTimers()
+    const requests: string[] = []
+    vi.stubGlobal('fetch', async (input: string) => {
+      requests.push(input)
+      return Response.json({ error: 'Unavailable fixture' }, { status: 404 })
+    })
+    const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    const container = document.createElement('div')
+    const root = createRoot(container)
+    const render = async (projects: boolean, projectFiles: boolean) => {
+      await act(async () =>
+        root.render(
+          <QueryClientProvider client={client}>
+            <FeatureFlagsProvider
+              flags={{
+                projects,
+                'project-files': projectFiles,
+                dashboards: false,
+                'mothership-model-selector': false,
+                'mothership-plan-mode': false,
+              }}
+            >
+              <WorkspaceResourceDisplay
+                data={{
+                  type: 'file',
+                  id: 'file',
+                  title: 'Fixture',
+                  owner: { entityType: 'project', entityId: 'project' },
+                }}
+              />
+            </FeatureFlagsProvider>
+          </QueryClientProvider>
+        )
+      )
+      await act(async () => vi.advanceTimersByTimeAsync(10))
+    }
+    try {
+      await render(true, true)
+      expect(requests).toHaveLength(1)
+      requests.length = 0
+      await render(projects, projectFiles)
+      await act(async () => client.invalidateQueries())
+      expect(requests).toEqual([])
+    } finally {
+      await act(async () => root.unmount())
+      client.clear()
+      vi.useRealTimers()
+      vi.unstubAllGlobals()
+    }
+  })
+})
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 fd03be2d91a..c53e02818dd 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
@@ -53,6 +53,7 @@ import {
   parseSearchConnectionBody,
   searchConnectionTargetSchema,
 } from '@/lib/knowledge/search/connection-target'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import { rememberSettingsReturnUrl } from '@/lib/navigation/settings-return'
 import { OAUTH_PROVIDERS } from '@/lib/oauth/oauth'
 import { getServiceConfigByProviderId } from '@/lib/oauth/utils'
@@ -96,6 +97,7 @@ import type {
 // ConnectServiceAccountModal, and that edge would pull the modal into this
 // chunk and defeat the lazy() split below.
 import { useServiceAccountConnectTarget } from '@/app/workspace/[workspaceId]/integrations/components/connect-service-account-modal/use-service-account-connect'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useOptionalWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { BrandIcon } from '@/blocks/brand-icon'
@@ -111,6 +113,7 @@ import {
   useUpsertWorkspaceEnvironment,
 } from '@/hooks/queries/environment'
 import { useKnowledgeBasesQuery } from '@/hooks/queries/kb/knowledge'
+import { useProjectFile } from '@/hooks/queries/project-files'
 import { useTablesList } from '@/hooks/queries/tables'
 import { findWorkspaceFileByPath } from '@/hooks/queries/utils/find-workspace-file-by-src'
 import { useWorkflows } from '@/hooks/queries/workflows'
@@ -362,6 +365,7 @@ export const WORKSPACE_RESOURCE_TAG_TYPES = ['workflow', 'table', 'dashboard', '
 export type WorkspaceResourceTagType = (typeof WORKSPACE_RESOURCE_TAG_TYPES)[number]
 
 export interface WorkspaceResourceTagData {
+  owner?: FileOperationOwner
   /** Explicit resource owner in organization chat; omitted on a workspace surface. */
   workspaceId?: string
   type: WorkspaceResourceTagType
@@ -677,6 +681,16 @@ function isWorkspaceResourceTagData(value: unknown): value is WorkspaceResourceT
 
   const id = typeof value.id === 'string' ? value.id.trim() : ''
   const path = typeof value.path === 'string' ? value.path.trim() : ''
+  if (value.owner !== undefined) {
+    const parsed = FileOperationOwner.safeParse(value.owner)
+    return (
+      parsed.success &&
+      parsed.data.entityType === 'project' &&
+      value.type === 'file' &&
+      value.workspaceId === undefined &&
+      id.length > 0
+    )
+  }
   if (value.type === 'file') return id.length > 0 || path.length > 0
   return id.length > 0
 }
@@ -1951,7 +1965,12 @@ function toChatMessageContext(data: WorkspaceResourceTagData, label: string): Ch
     case 'dashboard':
       return { kind: 'dashboard', label, dashboardId: data.id ?? '' }
     case 'file':
-      return { kind: 'file', label, fileId: data.id ?? data.path ?? '' }
+      return {
+        kind: 'file',
+        label,
+        fileId: data.id ?? data.path ?? '',
+        ...(data.owner ? { owner: data.owner } : {}),
+      }
   }
 }
 
@@ -1965,6 +1984,16 @@ export function WorkspaceResourceDisplay(props: WorkspaceResourceDisplayProps) {
     workspaceId?: string
     organizationId?: string
   }>()
+  if (props.data.owner?.entityType === 'project' && props.data.id) {
+    return (
+      <ProjectFileResourceDisplay
+        projectId={props.data.owner.entityId}
+        fileId={props.data.id.trim()}
+        title={props.data.title}
+        onSelect={props.onSelect}
+      />
+    )
+  }
   if (organizationId) {
     const target = props.data.workspaceId
     if (!target) return <span role='status'>This resource needs an explicit workspace target.</span>
@@ -1984,6 +2013,44 @@ export function WorkspaceResourceDisplay(props: WorkspaceResourceDisplayProps) {
   return <WorkspaceResourceDisplayContent {...props} workspaceId={workspaceId} />
 }
 
+interface ProjectFileResourceDisplayProps {
+  projectId: string
+  fileId: string
+  title?: string
+  onSelect?: (resource: WorkspaceResourceRef) => void
+}
+
+function ProjectFileResourceDisplay({
+  projectId,
+  fileId,
+  title,
+  onSelect,
+}: ProjectFileResourceDisplayProps) {
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const enabled = projectsEnabled && projectFilesEnabled
+  const { data, isError } = useProjectFile(enabled ? projectId : undefined, fileId)
+  const file = data?.file
+  const label = file?.name ?? title ?? 'File'
+  if (isError) return <span role='status'>File unavailable.</span>
+  return (
+    <ResourceMention
+      icon={
+        <ContextMentionIcon
+          context={{ kind: 'file', fileId, label, fileName: file?.name }}
+          className='size-[12px] shrink-0 text-[var(--text-icon)]'
+        />
+      }
+      title={label}
+      onSelect={
+        file && onSelect
+          ? () => onSelect({ type: 'file', id: file.id, title: file.name, owner: file.owner })
+          : undefined
+      }
+    />
+  )
+}
+
 function WorkspaceResourceDisplayContent({
   data,
   onSelect,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.test.ts
index 7afe2494903..ce711fa6026 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.test.ts
@@ -1,7 +1,14 @@
 import { describe, expect, it } from 'vitest'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
-import { toCopyableMarkdown } from '@/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown'
-import { parseChipLinks } from '@/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec'
+import {
+  prepareCopyableMarkdown,
+  toCopyableMarkdown,
+} from '@/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown'
+import {
+  chipLinkToContext,
+  parseChipLinks,
+  serializeSelectionForClipboard,
+} from '@/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec'
 
 const WORKSPACE_FILES: WorkspaceFileRecord[] = [
   {
@@ -89,3 +96,64 @@ describe('toCopyableMarkdown', () => {
     expect(parseChipLinks(markdown)).toEqual([])
   })
 })
+
+describe('Project file references through clipboard Markdown', () => {
+  it('preserves the explicit Project when copying a prompt chip and pasting it back', () => {
+    const original = {
+      kind: 'file' as const,
+      fileId: 'project-file',
+      label: 'Architecture_[draft]',
+      owner: { entityType: 'project' as const, entityId: 'project/with spaces' },
+    }
+    const markdown = serializeSelectionForClipboard('@Architecture_[draft]', [original])
+    const links = parseChipLinks(markdown)
+    expect(links).toHaveLength(1)
+    expect(chipLinkToContext(links[0])).toEqual(original)
+    expect(markdown).toContain('?project=project%2Fwith%20spaces')
+  })
+
+  it('copies the assistant Project reference without resolving a same-name workspace file', () => {
+    const reference = {
+      type: 'file',
+      id: 'project-file',
+      title: 'The Bell at Low Tide.md',
+      owner: { entityType: 'project', entityId: 'project-1' },
+    }
+    const message = `See <workspace_resource>${JSON.stringify(reference)}</workspace_resource>.`
+    const markdown = prepareCopyableMarkdown(message, WORKSPACE_FILES, async () => {
+      throw new Error('Project references must not load workspace files')
+    })
+    expect(typeof markdown).toBe('string')
+    if (typeof markdown !== 'string') throw new Error('Project reference was unresolved')
+    const [link] = parseChipLinks(markdown)
+    expect(chipLinkToContext(link)).toEqual({
+      kind: 'file',
+      fileId: 'project-file',
+      label: 'The Bell at Low Tide.md',
+      owner: { entityType: 'project', entityId: 'project-1' },
+    })
+  })
+
+  it.each([
+    { type: 'file', id: 'file_bell', workspaceId: 'workspace-1' },
+    { type: 'table', id: 'table-1' },
+    { type: 'file', path: 'files/The%20Bell%20at%20Low%20Tide.md' },
+  ])('does not turn an invalid Project reference into a workspace chip: %j', (target) => {
+    const message = `<workspace_resource>${JSON.stringify({
+      ...target,
+      title: 'The Bell at Low Tide.md',
+      owner: { entityType: 'project', entityId: 'project-1' },
+    })}</workspace_resource>`
+    expect(parseChipLinks(toCopyableMarkdown(message, WORKSPACE_FILES))).toEqual([])
+  })
+
+  it.each([
+    'sim:file/file-1?project=p&workspace=w',
+    'sim:file/file-1?workspace=w&project=p',
+    'sim:file/file-1?project=p&project=q',
+    'sim:table/table-1?project=p',
+    'sim:file/file-1?organization=o',
+  ])('keeps ambiguous or unsupported portable ownership as plain text: %s', (address) => {
+    expect(parseChipLinks(`[Resource](${address})`)).toEqual([])
+  })
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.ts
index 1f4742101b1..3543008dd3a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/copyable-markdown.ts
@@ -41,6 +41,14 @@ function portableWorkspaceResourceMarkdown(
   workspaceFiles: readonly WorkspaceFileRecord[]
 ): CopyableMarkdownResult {
   const label = workspaceResourceLabel(data)
+  if (data.owner?.entityType === 'project') {
+    return {
+      markdown: data.id?.trim()
+        ? serializePortableChipLink('file', data.id.trim(), label, data.owner)
+        : label,
+      hasUnresolvedFile: false,
+    }
+  }
   const resource = resolveWorkspaceResourceRef({ ...data, title: data.title ?? '' }, workspaceFiles)
   return {
     markdown: resource
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
index f93063bd6be..0488c1c1282 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
@@ -66,7 +66,10 @@ import type {
   WorkspaceResourceRef,
 } from '@/app/workspace/[workspaceId]/home/types'
 import { useOptionalWorkspacePermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { getWorkspaceFilesQueryOptions, workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+import {
+  getWorkspaceFilesQueryOptions,
+  workspaceFilesKeys,
+} from '@/hooks/queries/utils/workspace-file-query'
 import { useAutoScroll } from '@/hooks/use-auto-scroll'
 import type { ChatContext } from '@/stores/panel'
 import { MothershipChatSkeleton } from './components/mothership-chat-skeleton'
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-resources-context/mothership-resources-context.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-resources-context/mothership-resources-context.tsx
index ddc208f17ef..2d3058a4820 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-resources-context/mothership-resources-context.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-resources-context/mothership-resources-context.tsx
@@ -21,7 +21,8 @@ interface MothershipResourcesContextValue {
   removeResource: (
     resourceType: MothershipResourceType,
     resourceId: string,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: MothershipResource['owner']
   ) => void
   /** Replaces the resource list with a new ordering. */
   reorderResources: (resources: MothershipResource[]) => void
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
index 1773f242283..2bc2381d89d 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
@@ -7,18 +7,23 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuItemLabel,
+  DropdownMenuLabel,
   DropdownMenuSearchInput,
+  DropdownMenuSeparator,
   DropdownMenuSub,
   DropdownMenuSubContent,
   DropdownMenuSubTrigger,
   DropdownMenuTrigger,
   NATIVE_SURFACE_OCCLUSION_PREPARE_EVENT,
+  OverflowText,
   TabStripAction,
   Tooltip,
 } from '@sim/emcn'
 import { Folder, Plus } from '@sim/emcn/icons'
 import { IdentityTile } from '@/components/identity-tile/identity-tile'
+import type { Project } from '@/lib/api/contracts/projects'
 import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport'
+import { getChatResourceKey } from '@/lib/mothership/resources/types'
 import { isTerminalAvailable } from '@/lib/terminal/transport'
 import { getWorkspaceInitial } from '@/lib/workspaces/initials'
 import {
@@ -33,6 +38,10 @@ import {
   mergeOrganizationResourceInventories,
   OrganizationResourceInventory,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory'
+import {
+  useAvailableProjectInventories,
+  useAvailableProjectResources,
+} from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/project-resources'
 import {
   buildResourceFolderTree,
   type ResourceTreeNode,
@@ -43,10 +52,13 @@ import {
   getResourceConfig,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
 import { RESOURCE_TAB_ICON_CLASS } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
+import { resourceMentionMatches } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items'
 import type {
   MothershipResource,
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { useProjectInventory } from '@/hooks/queries/projects'
 import { useOrderedWorkspacesQuery, type Workspace } from '@/hooks/queries/workspace'
 
 export interface AddResourceDropdownProps {
@@ -111,7 +123,7 @@ export function ResourceFolderTreeItems({
               <DropdownMenuItemLabel label={node.name} />
             </DropdownMenuSubTrigger>
             <DropdownMenuSubContent className={subContentClassName}>
-              {folderType && (
+              {folderType && node.selectable !== false && (
                 <DropdownMenuItem
                   onClick={() => onSelect({ type: folderType, id: node.id, title: node.name })}
                 >
@@ -200,7 +212,7 @@ export function useResourceTreeSections({
       nodes: buildResourceFolderTree(
         itemsOf(spec.type),
         spec.folders.kind === 'group'
-          ? itemsOf(spec.folders.type)
+          ? [...itemsOf(spec.folders.type), ...(spec.type === 'file' ? structureFolders.file : [])]
           : structureFolders[spec.folders.key],
         { orderBySortOrder: spec.orderBySortOrder, pruneEmpty: !selectFolders && !spec.folderType }
       ),
@@ -283,14 +295,15 @@ export function ResourceMenuSections({
               ) : (
                 items.map((item) => (
                   <DropdownMenuItem
-                    key={`${item.workspaceId ?? ''}:${item.id}`}
+                    key={getChatResourceKey(resourceFromItem(type, item))}
                     onClick={() => onSelect(resourceFromItem(type, item))}
                   >
                     {config.renderDropdownItem({ item })}
-                    {typeof item.workspaceName === 'string' && (
-                      <span className='ml-auto text-[var(--text-muted)] text-xs'>
-                        {item.workspaceName}
-                      </span>
+                    {typeof (item.projectName ?? item.workspaceName) === 'string' && (
+                      <OverflowText
+                        label={String(item.projectName ?? item.workspaceName)}
+                        className='ml-auto max-w-[35%] shrink-0 text-[var(--text-muted)] text-xs'
+                      />
                     )}
                   </DropdownMenuItem>
                 ))
@@ -322,13 +335,7 @@ function ResourceMenuSearch({
     const q = search.toLowerCase().trim()
     if (!q) return null
     return available.flatMap(({ type, items }) =>
-      items
-        .filter(
-          (item) =>
-            item.name.toLowerCase().includes(q) ||
-            (typeof item.workspaceName === 'string' && item.workspaceName.toLowerCase().includes(q))
-        )
-        .map((item) => ({ type, item }))
+      items.filter((item) => resourceMentionMatches(item, q)).map((item) => ({ type, item }))
     )
   }, [search, available])
 
@@ -370,16 +377,17 @@ function ResourceMenuSearch({
                    cursor, so it paints the hover surface rather than the selected one. */
               return (
                 <DropdownMenuItem
-                  key={`${type}:${item.workspaceId ?? ''}:${item.id}`}
+                  key={getChatResourceKey(resourceFromItem(type, item))}
                   className={cn(index === activeIndex && 'bg-[var(--surface-hover)]')}
                   onMouseEnter={() => setActiveIndex(index)}
                   onClick={() => select(resourceFromItem(type, item))}
                 >
                   {config.renderDropdownItem({ item })}
-                  {typeof item.workspaceName === 'string' && (
-                    <span className='ml-auto text-[var(--text-muted)] text-xs'>
-                      {item.workspaceName}
-                    </span>
+                  {typeof (item.projectName ?? item.workspaceName) === 'string' && (
+                    <OverflowText
+                      label={String(item.projectName ?? item.workspaceName)}
+                      className='ml-auto max-w-[35%] shrink-0 text-[var(--text-muted)] text-xs'
+                    />
                   )}
                 </DropdownMenuItem>
               )
@@ -402,6 +410,7 @@ interface WorkspaceResourceMenuContentProps {
   enabled: boolean
   excludeTypes?: readonly MothershipResourceType[]
   searchable?: boolean
+  includeProjectFiles?: boolean
   /** Offers every folder as an attachable entry, as chat does. */
   selectFolders?: boolean
   onSelect: (resource: MothershipResource) => void
@@ -413,6 +422,7 @@ function WorkspaceResourceMenuContent({
   enabled,
   excludeTypes,
   searchable = true,
+  includeProjectFiles,
   selectFolders,
   onSelect,
   subContentClassName,
@@ -420,11 +430,14 @@ function WorkspaceResourceMenuContent({
   const { groups, structureFolders, isHydrating } = useAvailableResources(workspaceId, {
     enabled,
     excludeTypes,
+    includeProjectFiles,
   })
   const sections = useResourceTreeSections({ groups, structureFolders, selectFolders })
   const select = (resource: MothershipResource) =>
     onSelect(
-      resource.type === 'browser' || resource.type === 'terminal'
+      resource.type === 'browser' ||
+        resource.type === 'terminal' ||
+        resource.owner?.entityType === 'project'
         ? resource
         : { ...resource, workspaceId }
     )
@@ -455,10 +468,7 @@ interface WorkspaceResourceSubmenuProps {
   excludeTypes?: readonly MothershipResourceType[]
   selectFolders?: boolean
   onSelect: (resource: MothershipResource) => void
-  /**
-   * Offers the workspace itself as the first entry, the way a folder submenu
-   * offers its folder, for pickers that can attach a whole workspace.
-   */
+  /** Selects the workspace directly from its root row when the picker supports it. */
   onSelectWorkspace?: (workspace: Pick<Workspace, 'id' | 'name'>) => void
   subContentClassName?: string
 }
@@ -481,24 +491,35 @@ export function WorkspaceResourceSubmenu({
   )
   return (
     <DropdownMenuSub open={open} onOpenChange={setOpen}>
-      <DropdownMenuSubTrigger>
+      <DropdownMenuSubTrigger
+        onClick={(event) => {
+          if (!onSelectWorkspace) return
+          event.preventDefault()
+          onSelectWorkspace(workspace)
+        }}
+        onKeyDown={(event) => {
+          if (
+            !onSelectWorkspace ||
+            event.target !== event.currentTarget ||
+            (event.key !== 'Enter' && event.key !== ' ')
+          )
+            return
+          event.preventDefault()
+          onSelectWorkspace(workspace)
+        }}
+      >
         {icon}
         <DropdownMenuItemLabel label={workspace.name} />
       </DropdownMenuSubTrigger>
       <DropdownMenuSubContent
         className={cn('flex w-[320px] flex-col overflow-hidden', subContentClassName)}
       >
-        {onSelectWorkspace && (
-          <DropdownMenuItem onClick={() => onSelectWorkspace(workspace)}>
-            {icon}
-            <DropdownMenuItemLabel label={workspace.name} />
-          </DropdownMenuItem>
-        )}
         <WorkspaceResourceMenuContent
           workspaceId={workspace.id}
           enabled={open}
           excludeTypes={excludeTypes}
           searchable={false}
+          includeProjectFiles={false}
           selectFolders={selectFolders}
           onSelect={onSelect}
           subContentClassName={subContentClassName}
@@ -508,6 +529,98 @@ export function WorkspaceResourceSubmenu({
   )
 }
 
+interface ProjectResourceSubmenuProps {
+  project: Project
+  workspaces: ReadonlyArray<Pick<Workspace, 'id' | 'name' | 'logoUrl'>>
+  excludeTypes?: readonly MothershipResourceType[]
+  selectFolders?: boolean
+  onSelect: (resource: MothershipResource) => void
+  onSelectProject?: (project: Pick<Project, 'id' | 'name'>) => void
+  onSelectWorkspace?: (workspace: Pick<Workspace, 'id' | 'name'>) => void
+  subContentClassName?: string
+}
+
+/** A Project owns shared files; its environments retain their workspace resources. */
+export function ProjectResourceSubmenu({
+  project,
+  workspaces,
+  excludeTypes,
+  selectFolders,
+  onSelect,
+  onSelectProject,
+  onSelectWorkspace,
+  subContentClassName,
+}: ProjectResourceSubmenuProps) {
+  const [open, setOpen] = useState(false)
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const showFiles = projectFilesEnabled && !excludeTypes?.includes('file')
+  const inventory = useAvailableProjectResources({ project, enabled: open && showFiles })
+  const sections = useResourceTreeSections(inventory)
+  const fileNodes = sections.find((section) => section.type === 'file')?.nodes ?? []
+  const workspaceById = new Map(workspaces.map((workspace) => [workspace.id, workspace]))
+  const environments = project.environments.map(
+    (environment) => workspaceById.get(environment.id) ?? environment
+  )
+  return (
+    <DropdownMenuSub open={open} onOpenChange={setOpen}>
+      <DropdownMenuSubTrigger
+        onClick={(event) => {
+          if (!onSelectProject) return
+          event.preventDefault()
+          onSelectProject(project)
+        }}
+        onKeyDown={(event) => {
+          if (
+            !onSelectProject ||
+            event.target !== event.currentTarget ||
+            (event.key !== 'Enter' && event.key !== ' ')
+          )
+            return
+          event.preventDefault()
+          onSelectProject(project)
+        }}
+      >
+        <Folder className='size-[14px]' />
+        <DropdownMenuItemLabel label={project.name} />
+      </DropdownMenuSubTrigger>
+      <DropdownMenuSubContent className={cn('w-[320px]', subContentClassName)}>
+        <DropdownMenuLabel>Environments</DropdownMenuLabel>
+        {environments.map((workspace) => (
+          <WorkspaceResourceSubmenu
+            key={workspace.id}
+            workspace={workspace}
+            excludeTypes={excludeTypes}
+            selectFolders={selectFolders}
+            onSelect={onSelect}
+            onSelectWorkspace={onSelectWorkspace}
+            subContentClassName={subContentClassName}
+          />
+        ))}
+        {!environments.length && (
+          <DropdownMenuItem disabled>No accessible environments</DropdownMenuItem>
+        )}
+        {showFiles && (
+          <>
+            <DropdownMenuSeparator />
+            <DropdownMenuLabel>Project files</DropdownMenuLabel>
+            <ResourceFolderTreeItems
+              nodes={fileNodes}
+              type='file'
+              onSelect={onSelect}
+              subContentClassName={subContentClassName}
+            />
+            {!fileNodes.length && (
+              <DropdownMenuItem disabled>
+                {inventory.isHydrating ? 'Loading files' : 'No shared files'}
+              </DropdownMenuItem>
+            )}
+          </>
+        )}
+      </DropdownMenuSubContent>
+    </DropdownMenuSub>
+  )
+}
+
 const WORKSPACE_FLYOUT_EXCLUDED_TYPES: readonly MothershipResourceType[] = ['browser', 'terminal']
 
 export function AddResourceDropdown({
@@ -519,6 +632,9 @@ export function AddResourceDropdown({
   onClose,
 }: AddResourceDropdownProps) {
   const [open, setOpen] = useState(false)
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectQuery = useProjectInventory(organizationId, open && projectsEnabled)
+  const projects = projectsEnabled && !projectQuery.isError ? (projectQuery.data ?? []) : []
   const { data: allWorkspaces = [] } = useOrderedWorkspacesQuery(open && Boolean(organizationId))
   const workspaces = allWorkspaces.filter(
     (workspace) => workspace.organizationId === organizationId
@@ -533,7 +649,16 @@ export function AddResourceDropdown({
       current[workspaceId] === inventory ? current : { ...current, [workspaceId]: inventory }
     )
   }, [])
-  const organizationInventory = mergeOrganizationResourceInventories(workspaces, inventories)
+  const projectInventories = useAvailableProjectInventories({
+    projects,
+    enabled: open && Boolean(organizationId) && !excludeTypes?.includes('file'),
+  })
+  const organizationInventory = mergeOrganizationResourceInventories(
+    workspaces,
+    inventories,
+    projects,
+    projectInventories
+  )
   const contentRef = useRef<HTMLDivElement>(null)
   const { groups } = useAvailableResources('', {
     enabled: open && !suppliedWorkspaceId,
@@ -588,6 +713,7 @@ export function AddResourceDropdown({
             onChange={receiveInventory}
           />
         ))}
+
       <Tooltip.Root>
         <Tooltip.Trigger asChild>
           <DropdownMenuTrigger asChild>
@@ -622,19 +748,37 @@ export function AddResourceDropdown({
               ),
               ...nativeGroups,
             ]}
-            isHydrating={organizationInventory.isHydrating}
+            isHydrating={
+              organizationInventory.isHydrating || (projectsEnabled && projectQuery.isPending)
+            }
             onSelect={select}
           >
-            {workspaces.map((workspace) => (
-              <WorkspaceResourceSubmenu
-                key={workspace.id}
-                workspace={workspace}
+            {projects.map((project) => (
+              <ProjectResourceSubmenu
+                key={project.id}
+                project={project}
+                workspaces={workspaces}
                 excludeTypes={flyoutExcludedTypes}
                 onSelect={select}
               />
             ))}
-            {!workspaces.length && (
-              <DropdownMenuItem disabled>No accessible workspaces</DropdownMenuItem>
+            {!projectsEnabled &&
+              workspaces.map((workspace) => (
+                <WorkspaceResourceSubmenu
+                  key={workspace.id}
+                  workspace={workspace}
+                  excludeTypes={flyoutExcludedTypes}
+                  onSelect={select}
+                />
+              ))}
+            {projectsEnabled && !projects.length && (
+              <DropdownMenuItem disabled>
+                {projectQuery.isPending
+                  ? 'Loading projects'
+                  : projectQuery.isError
+                    ? 'Unable to load projects'
+                    : 'No accessible projects'}
+              </DropdownMenuItem>
             )}
             <ResourceMenuSections sections={[]} groups={nativeGroups} onSelect={select} />
           </ResourceMenuSearch>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources.ts
index 70bf34e89cc..fd5b7997248 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources.ts
@@ -16,6 +16,7 @@ import { useFolders } from '@/hooks/queries/folders'
 import { useKnowledgeBasesQuery } from '@/hooks/queries/kb/knowledge'
 import { useLogsList } from '@/hooks/queries/logs'
 import { useMothershipChats } from '@/hooks/queries/mothership-chats'
+import { useProjectFileInventory, useWorkspaceProject } from '@/hooks/queries/project-files'
 import { useTablesList } from '@/hooks/queries/tables'
 import { useWorkflows } from '@/hooks/queries/workflows'
 import { useWorkspaceFileFolders } from '@/hooks/queries/workspace-file-folders'
@@ -42,6 +43,7 @@ export interface AvailableItemsByType {
 export interface StructureFolders {
   table: AvailableItem[]
   knowledgebase: AvailableItem[]
+  file: AvailableItem[]
 }
 
 export interface AvailableResources {
@@ -56,6 +58,7 @@ export interface AvailableResources {
 }
 
 interface UseAvailableResourcesOptions {
+  includeProjectFiles?: boolean
   /** Chat can attach every folder family, so these lists also gate mention hydration. */
   includeFolderMentions?: boolean
   /**
@@ -97,8 +100,20 @@ export function useAvailableResources(
   options?: UseAvailableResourcesOptions
 ): AvailableResources {
   const dashboardsEnabled = useFeatureFlag('dashboards')
+  const projectFilesEnabled = useFeatureFlag('project-files')
   const enabled = options?.enabled ?? true
   const excludeTypes = options?.excludeTypes
+  const projectEnabled =
+    projectFilesEnabled &&
+    enabled &&
+    options?.includeProjectFiles !== false &&
+    Boolean(workspaceId) &&
+    !excludeTypes?.includes('file')
+  const parent = useWorkspaceProject(workspaceId, projectEnabled)
+  const project = projectEnabled && !parent.isError ? parent.data?.project : undefined
+  const projectInventory = useProjectFileInventory(project?.id, projectEnabled)
+  const projectItems = project && !projectInventory.isError ? projectInventory.data : undefined
+  const projectRootId = project ? `project-file-scope:${project.id}` : undefined
   const browserAvailable = useSyncExternalStore(
     subscribeDesktopPreferences,
     isBrowserAgentAvailable,
@@ -171,6 +186,7 @@ export function useAvailableResources(
     (workflowsPending ||
       tablesPending ||
       filesPending ||
+      (projectEnabled && (parent.isPending || (Boolean(project) && projectInventory.isPending))) ||
       (dashboardsEnabled && !excludeTypes?.includes('dashboard') && dashboardsPending) ||
       knowledgeBasesPending ||
       foldersPending ||
@@ -220,7 +236,20 @@ export function useAvailableResources(
       },
       {
         type: 'file' as const,
-        items: (files ?? []).map((f) => ({ id: f.id, name: f.name, folderId: f.folderId ?? null })),
+        items: [
+          ...(files ?? []).map((f) => ({ id: f.id, name: f.name, folderId: f.folderId ?? null })),
+          ...(project && projectItems
+            ? projectItems
+                .filter((item) => item.kind === 'file')
+                .map((item) => ({
+                  id: item.id,
+                  name: item.name,
+                  folderId: item.parentId ?? projectRootId,
+                  owner: { entityType: 'project' as const, entityId: project.id },
+                  projectName: project.name,
+                }))
+            : []),
+        ],
       },
       {
         type: 'filefolder' as const,
@@ -310,6 +339,9 @@ export function useAvailableResources(
     fileFolders,
     tables,
     files,
+    project,
+    projectItems,
+    projectRootId,
     dashboardData,
     knowledgeBases,
     tasks,
@@ -329,8 +361,28 @@ export function useAvailableResources(
     return {
       table: toFolderItems(tableFolders),
       knowledgebase: toFolderItems(knowledgeBaseFolders),
+      file:
+        project && projectItems && projectRootId
+          ? [
+              {
+                id: projectRootId,
+                name: project.name,
+                owner: { entityType: 'project', entityId: project.id },
+                selectable: false,
+              },
+              ...projectItems
+                .filter((item) => item.kind === 'folder')
+                .map((item) => ({
+                  id: item.id,
+                  name: item.name,
+                  parentId: item.parentId ?? projectRootId,
+                  owner: { entityType: 'project' as const, entityId: project.id },
+                  selectable: false,
+                })),
+            ]
+          : [],
     }
-  }, [tableFolders, knowledgeBaseFolders])
+  }, [tableFolders, knowledgeBaseFolders, project, projectItems, projectRootId])
 
   // `groups` and `structureFolders` keep their own stable identities so the
   // consumers' downstream memos still key on them; only this wrapper changes
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/index.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/index.ts
index 0e9f610be57..bed09b1c336 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/index.ts
@@ -1,6 +1,7 @@
 export {
   AddResourceDropdown,
   FOLDERED_RESOURCE_TYPES,
+  ProjectResourceSubmenu,
   ResourceFolderTreeItems,
   ResourceMenuSections,
   useResourceTreeSections,
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.test.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.test.ts
index 6078f260c35..705f1870424 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.test.ts
@@ -13,10 +13,38 @@ const inventory = {
     { type: 'file' as const, items: [{ id: 'report.csv', name: 'Report' }] },
     { type: 'integration' as const, items: [{ id: 'slack', name: 'Slack' }] },
   ],
-  structureFolders: { table: [], knowledgebase: [] },
+  structureFolders: { table: [], knowledgebase: [], file: [] },
   isHydrating: false,
 }
 describe('organization mention inventory', () => {
+  it('offers a shared Project file once without borrowing either environment as its owner', () => {
+    const projectFile = {
+      id: 'architecture',
+      name: 'Architecture.md',
+      owner: { entityType: 'project', entityId: 'shared-project' } as const,
+      projectName: 'Payments',
+    }
+    const shared = {
+      ...inventory,
+      groups: [{ type: 'file' as const, items: [...inventory.groups[0].items, projectFile] }],
+    }
+    const result = mergeOrganizationResourceInventories(
+      [
+        { id: 'sandbox', name: 'Sandbox' },
+        { id: 'production', name: 'Production' },
+      ],
+      { sandbox: shared, production: shared, unrelated: inventory }
+    )
+    expect(result.groups[0].items.map((item) => resourceFromItem('file', item))).toEqual([
+      { type: 'file', id: 'report.csv', title: 'Report', workspaceId: 'sandbox' },
+      { type: 'file', id: 'architecture', title: 'Architecture.md', owner: projectFile.owner },
+      { type: 'file', id: 'report.csv', title: 'Report', workspaceId: 'production' },
+    ])
+    const selected = result.groups[0].items.find((item) => item.id === 'architecture')
+    expect(selected?.projectName).toBe('Payments')
+    expect(selected?.workspaceName).toBeUndefined()
+  })
+
   it('retains explicit owners for duplicate paths, labels workspaces, and excludes unrelated inventories', () => {
     const result = mergeOrganizationResourceInventories(
       [
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.tsx
index 1dbf07425e5..9725cfe44bd 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory.tsx
@@ -1,8 +1,10 @@
 import { useEffect } from 'react'
+import { getChatResourceKey } from '@/lib/mothership/resources/types'
 import {
   type AvailableResources,
   useAvailableResources,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources'
+import { resourceFromItem } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-from-item'
 
 /** Reuses each workspace's canonical inventory without introducing another picker. */
 export function OrganizationResourceInventory({
@@ -12,7 +14,10 @@ export function OrganizationResourceInventory({
   workspaceId: string
   onChange: (workspaceId: string, inventory: AvailableResources) => void
 }) {
-  const inventory = useAvailableResources(workspaceId, { includeFolderMentions: true })
+  const inventory = useAvailableResources(workspaceId, {
+    includeFolderMentions: true,
+    includeProjectFiles: false,
+  })
   useEffect(() => {
     onChange(workspaceId, inventory)
   }, [workspaceId, inventory, onChange])
@@ -21,24 +26,37 @@ export function OrganizationResourceInventory({
 
 export function mergeOrganizationResourceInventories(
   workspaces: ReadonlyArray<{ id: string; name: string }>,
-  inventories: Readonly<Record<string, AvailableResources>>
+  inventories: Readonly<Record<string, AvailableResources>>,
+  projects: ReadonlyArray<{ id: string }> = [],
+  projectInventories: Readonly<Record<string, AvailableResources>> = {}
 ): AvailableResources {
   const groups: AvailableResources['groups'] = []
   const byType = new Map<string, AvailableResources['groups'][number]>()
-  const structureFolders: AvailableResources['structureFolders'] = { table: [], knowledgebase: [] }
+  const structureFolders: AvailableResources['structureFolders'] = {
+    table: [],
+    knowledgebase: [],
+    file: [],
+  }
+  const seen = new Set<string>()
+  const seenFileFolders = new Set<string>()
   let isHydrating = false
-  for (const workspace of workspaces) {
-    const inventory = inventories[workspace.id]
+  const sources = [
+    ...projects.map((project) => ({
+      inventory: projectInventories[project.id],
+      workspace: undefined,
+    })),
+    ...workspaces.map((workspace) => ({ inventory: inventories[workspace.id], workspace })),
+  ]
+  for (const { inventory, workspace } of sources) {
     if (!inventory) {
       isHydrating = true
       continue
     }
     isHydrating ||= inventory.isHydrating
-    const owned = (item: AvailableResources['groups'][number]['items'][number]) => ({
-      ...item,
-      workspaceId: workspace.id,
-      workspaceName: workspace.name,
-    })
+    const owned = (item: AvailableResources['groups'][number]['items'][number]) =>
+      !workspace || item.owner?.entityType === 'project'
+        ? item
+        : { ...item, workspaceId: workspace.id, workspaceName: workspace.name }
     for (const group of inventory.groups) {
       if (group.type === 'browser' || group.type === 'terminal') continue
       // Integration definitions are global and do not belong to a workspace.
@@ -49,7 +67,19 @@ export function mergeOrganizationResourceInventories(
         groups.push(target)
         byType.set(group.type, target)
       }
-      target.items.push(...(group.type === 'integration' ? group.items : group.items.map(owned)))
+      for (const source of group.items) {
+        const item = group.type === 'integration' ? source : owned(source)
+        const key = getChatResourceKey(resourceFromItem(group.type, item))
+        if (seen.has(key)) continue
+        seen.add(key)
+        target.items.push(item)
+      }
+    }
+    for (const item of inventory.structureFolders.file) {
+      const key = getChatResourceKey(resourceFromItem('filefolder', item))
+      if (seenFileFolders.has(key)) continue
+      seenFileFolders.add(key)
+      structureFolders.file.push(item)
     }
     structureFolders.table.push(...inventory.structureFolders.table.map(owned))
     structureFolders.knowledgebase.push(...inventory.structureFolders.knowledgebase.map(owned))
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/project-resources.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/project-resources.ts
new file mode 100644
index 00000000000..06eac9eb138
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/project-resources.ts
@@ -0,0 +1,89 @@
+import { useMemo } from 'react'
+import type { ListProjectFilesResponse } from '@/lib/api/contracts/project-files'
+import type { Project } from '@/lib/api/contracts/projects'
+import type { AvailableResources } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/available-resources'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { useProjectFileInventories, useProjectFileInventory } from '@/hooks/queries/project-files'
+
+function projectResources(
+  project: Pick<Project, 'id' | 'name'>,
+  items: ListProjectFilesResponse['items'] | undefined,
+  isHydrating: boolean
+): AvailableResources {
+  const files: AvailableResources['groups'][number]['items'] = []
+  const folders: AvailableResources['structureFolders']['file'] = []
+  const owner = { entityType: 'project', entityId: project.id } as const
+  for (const item of items ?? []) {
+    if (item.kind === 'file') {
+      files.push({
+        id: item.id,
+        name: item.name,
+        folderId: item.parentId,
+        owner,
+        projectName: project.name,
+      })
+    } else {
+      folders.push({
+        id: item.id,
+        name: item.name,
+        parentId: item.parentId,
+        owner,
+        selectable: false,
+      })
+    }
+  }
+  return {
+    groups: [{ type: 'file', items: files }],
+    structureFolders: { table: [], knowledgebase: [], file: folders },
+    isHydrating,
+  }
+}
+
+interface UseAvailableProjectResourcesProps {
+  project: Pick<Project, 'id' | 'name'>
+  enabled?: boolean
+}
+
+/** Project resources retain their owner independently of any environment. */
+export function useAvailableProjectResources({
+  project,
+  enabled = true,
+}: UseAvailableProjectResourcesProps) {
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const active = enabled && projectFilesEnabled
+  const query = useProjectFileInventory(project.id, active)
+  const items = active && !query.isError ? query.data : undefined
+  const isHydrating = active && query.isPending
+  return useMemo(
+    () => projectResources({ id: project.id, name: project.name }, items, isHydrating),
+    [items, project.id, project.name, isHydrating]
+  )
+}
+
+interface UseAvailableProjectInventoriesProps {
+  projects: ReadonlyArray<Pick<Project, 'id' | 'name'>>
+  enabled: boolean
+}
+
+/** Derives current Project inventories directly from their query observers. */
+export function useAvailableProjectInventories({
+  projects,
+  enabled,
+}: UseAvailableProjectInventoriesProps): Record<string, AvailableResources> {
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const active = enabled && projectFilesEnabled
+  const queries = useProjectFileInventories(
+    projects.map((project) => project.id),
+    active
+  )
+  const inventories: Record<string, AvailableResources> = {}
+  for (const [index, project] of projects.entries()) {
+    const query = queries[index]
+    inventories[project.id] = projectResources(
+      project,
+      active && query && !query.isError ? query.data : undefined,
+      active && (query?.isPending ?? true)
+    )
+  }
+  return inventories
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree.ts
index ad2a58ca289..d9555e2123c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-folder-tree.ts
@@ -1,8 +1,17 @@
-export type AvailableItem = { id: string; name: string; [key: string]: unknown }
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+
+export interface AvailableItem {
+  id: string
+  name: string
+  owner?: EditableFileOwner
+  projectName?: string
+  selectable?: boolean
+  [key: string]: unknown
+}
 
 export type ResourceTreeNode =
   | { kind: 'item'; id: string; item: AvailableItem }
-  | { kind: 'folder'; id: string; name: string; children: ResourceTreeNode[] }
+  | { kind: 'folder'; id: string; name: string; selectable?: boolean; children: ResourceTreeNode[] }
 
 export interface BuildResourceFolderTreeOptions {
   /**
@@ -80,9 +89,15 @@ export function buildResourceFolderTree(
 
     for (const folder of childFolders) {
       const children = buildLevel(folder.id)
-      if (options?.pruneEmpty && children.length === 0) continue
+      if ((options?.pruneEmpty || folder.selectable === false) && children.length === 0) continue
       sources.push(folder)
-      nodes.push({ kind: 'folder', id: folder.id, name: folder.name, children })
+      nodes.push({
+        kind: 'folder',
+        id: folder.id,
+        name: folder.name,
+        children,
+        ...(folder.selectable === false ? { selectable: false } : {}),
+      })
     }
     for (const item of childItems) {
       sources.push(item)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-from-item.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-from-item.ts
index 3ec3b53b46f..35c026123b5 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-from-item.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/resource-from-item.ts
@@ -4,15 +4,7 @@ import type {
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
 
-/**
- * Builds the resource a picker row stands for.
- *
- * Every menu that selects a candidate goes through here so a family's extra
- * identifier reaches the resource. Constructing the literal inline silently
- * drops it — a log selected that way loses the execution id its chat context is
- * addressed by. Only `executionId` is carried today; add a field here when
- * another family needs one.
- */
+/** Builds the resource a picker row addresses, preserving its owner and execution context. */
 export function resourceFromItem(
   type: MothershipResourceType,
   item: AvailableItem
@@ -23,6 +15,9 @@ export function resourceFromItem(
     id: item.id,
     title: item.name,
     ...(executionId ? { executionId } : {}),
-    ...(typeof item.workspaceId === 'string' ? { workspaceId: item.workspaceId } : {}),
+    ...(item.owner ? { owner: item.owner } : {}),
+    ...(item.owner?.entityType !== 'project' && typeof item.workspaceId === 'string'
+      ? { workspaceId: item.workspaceId }
+      : {}),
   }
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file-folder.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file-folder.tsx
new file mode 100644
index 00000000000..8fcae6fe312
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file-folder.tsx
@@ -0,0 +1,110 @@
+'use client'
+
+import { useRef } from 'react'
+import {
+  Chip,
+  cn,
+  Skeleton,
+  scrollFadeAttributes,
+  scrollFadeClass,
+  useScrollEdges,
+} from '@sim/emcn'
+import { Folder } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { getDocumentIcon } from '@/components/icons/document-icons'
+import type { FileOwner } from '@/lib/workspace-files/ownership'
+import { useMothershipResources } from '@/app/workspace/[workspaceId]/home/components/mothership-resources-context'
+import { useProjectFileFolders, useProjectFiles } from '@/hooks/queries/project-files'
+import { useFileListRoom } from '@/hooks/use-file-list-room'
+
+interface EmbeddedProjectFileFolderProps {
+  owner: FileOwner & { entityType: 'project' }
+  folderId: string
+}
+
+export function EmbeddedProjectFileFolder({ owner, folderId }: EmbeddedProjectFileFolderProps) {
+  const scrollRef = useRef<HTMLDivElement>(null)
+  const { addResource } = useMothershipResources()
+  useFileListRoom({ owner })
+  const folders = useProjectFileFolders(owner.entityId)
+  const folder = folders.data?.folders.find((item) => item.id === folderId)
+  const list = useProjectFiles(
+    owner.entityId,
+    {
+      scope: 'active',
+      folderId,
+      types: [],
+      sizes: [],
+      creatorIds: [],
+      sortBy: 'name',
+      sortOrder: 'asc',
+      limit: 100,
+    },
+    Boolean(folder)
+  )
+  const edges = useScrollEdges(scrollRef, { enabled: Boolean(folder) && list.isSuccess })
+
+  if (folders.isPending || (folder && list.isPending)) {
+    return (
+      <div className='flex h-full flex-col gap-2 p-6'>
+        <Skeleton className='h-4 w-3/5' />
+        <Skeleton className='h-4 w-4/5' />
+      </div>
+    )
+  }
+  if (folders.isError || list.isError || !folder) {
+    return (
+      <p role='status' className='p-6 text-[var(--text-muted)] text-small'>
+        {getErrorMessage(folders.error ?? list.error, 'This Project folder is unavailable')}
+      </p>
+    )
+  }
+
+  const items = list.data?.pages.flatMap((page) => page.items) ?? []
+  return (
+    <div
+      ref={scrollRef}
+      className={cn('h-full overflow-y-auto p-6', scrollFadeClass)}
+      {...scrollFadeAttributes(edges)}
+    >
+      <div>
+        <h2 className='mb-4 text-[var(--text-body)] text-md'>{folder.name}</h2>
+        {items.length === 0 ? (
+          <p className='text-[var(--text-muted)] text-small'>This folder is empty</p>
+        ) : (
+          <div className='flex flex-col gap-1'>
+            {items.map((item) => {
+              const Icon = item.kind === 'folder' ? Folder : getDocumentIcon(item.type, item.name)
+              return (
+                <Chip
+                  key={`${item.kind}:${item.id}`}
+                  fullWidth
+                  leftIcon={Icon}
+                  onClick={() =>
+                    addResource({
+                      type: item.kind === 'folder' ? 'filefolder' : 'file',
+                      id: item.id,
+                      title: item.name,
+                      owner,
+                    })
+                  }
+                >
+                  {item.name}
+                </Chip>
+              )
+            })}
+          </div>
+        )}
+        {list.hasNextPage && (
+          <Chip
+            className='mt-3'
+            disabled={list.isFetchingNextPage}
+            onClick={() => void list.fetchNextPage()}
+          >
+            {list.isFetchingNextPage ? 'Loading' : 'Load more'}
+          </Chip>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.test.tsx
new file mode 100644
index 00000000000..b954c5febb3
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.test.tsx
@@ -0,0 +1,51 @@
+/** @vitest-environment jsdom */
+import { act } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { createRoot } from 'react-dom/client'
+import { expect, it, vi } from 'vitest'
+import { EmbeddedProjectFile } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+
+vi.mock(
+  'next/navigation',
+  async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock
+)
+vi.mock('@/hooks/use-file-list-room', () => ({ useFileListRoom: () => {} }))
+const viewer = vi.hoisted(() => ({ input: {} as Record<string, unknown> }))
+vi.mock('@/app/workspace/[workspaceId]/files/components/file-viewer', () => ({
+  FileViewer: (props: Record<string, unknown>) => {
+    viewer.input = props
+    return null
+  },
+}))
+
+it('excludes ownerless preview fields at the Project viewer boundary', async () => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  const client = new QueryClient()
+  client.setQueryData(projectFilesKeys.record('project', 'file'), {
+    file: { id: 'file', owner: { entityType: 'project', entityId: 'project' } },
+    capabilities: { canWrite: true },
+  })
+  const container = document.createElement('div')
+  const root = createRoot(container)
+  const preview = { streamingContent: 'Unqualified workspace preview', isAgentEditing: true }
+  try {
+    await act(async () =>
+      root.render(
+        <QueryClientProvider client={client}>
+          <EmbeddedProjectFile projectId='project' fileId='file' {...preview} />
+        </QueryClientProvider>
+      )
+    )
+    expect(viewer.input).toMatchObject({
+      owner: { entityType: 'project', entityId: 'project' },
+      collaborative: true,
+      canEdit: true,
+    })
+    expect(viewer.input).not.toHaveProperty('streamingContent')
+    expect(viewer.input).not.toHaveProperty('isAgentEditing')
+  } finally {
+    await act(async () => root.unmount())
+    client.clear()
+  }
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.tsx
new file mode 100644
index 00000000000..51a597129e1
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file.tsx
@@ -0,0 +1,123 @@
+'use client'
+
+import type { MutableRefObject } from 'react'
+import { Skeleton, TabStripAction, Tooltip, toast } from '@sim/emcn'
+import { Download, FileX, SquareArrowUpRight } from '@sim/emcn/icons'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useRouter } from 'next/navigation'
+import { type FileDownloadSource, triggerProjectFileDownload } from '@/lib/uploads/client/download'
+import {
+  FileViewer,
+  type PreviewMode,
+} from '@/app/workspace/[workspaceId]/files/components/file-viewer'
+import { RESOURCE_TAB_ICON_CLASS } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
+import { useProjectFile } from '@/hooks/queries/project-files'
+import { useFileListRoom } from '@/hooks/use-file-list-room'
+
+interface ProjectFileProps {
+  projectId: string
+  fileId: string
+  downloadSourceRef?: MutableRefObject<FileDownloadSource | null>
+  previewMode?: PreviewMode
+}
+
+export function EmbeddedProjectFile({
+  projectId,
+  fileId,
+  downloadSourceRef,
+  previewMode,
+}: ProjectFileProps) {
+  useFileListRoom({ owner: { entityType: 'project', entityId: projectId } })
+  const { data, isPending, error } = useProjectFile(projectId, fileId)
+  if (isPending) {
+    return (
+      <div className='flex h-full flex-col gap-2 p-6'>
+        <Skeleton className='h-[16px] w-[60%]' />
+        <Skeleton className='h-[16px] w-[80%]' />
+      </div>
+    )
+  }
+  if (error || !data) {
+    return (
+      <div className='flex h-full flex-col items-center justify-center gap-3'>
+        <FileX className='size-[32px] text-[var(--text-icon)]' />
+        <p className='text-[var(--text-body)] text-small'>
+          {getErrorMessage(error, 'This Project file is unavailable')}
+        </p>
+      </div>
+    )
+  }
+  return (
+    <div className='flex h-full flex-col overflow-hidden'>
+      <FileViewer
+        downloadSourceRef={downloadSourceRef}
+        previewMode={previewMode}
+        key={data.file.id}
+        file={data.file}
+        owner={data.file.owner}
+        canEdit={data.capabilities.canWrite}
+        collaborative
+        enableFind
+      />
+    </div>
+  )
+}
+
+interface ProjectFileActionsProps {
+  projectId: string
+  fileId: string
+  downloadSourceRef?: MutableRefObject<FileDownloadSource | null>
+}
+
+export function ProjectFileActions({
+  projectId,
+  fileId,
+  downloadSourceRef,
+}: ProjectFileActionsProps) {
+  const router = useRouter()
+  const { data, isSuccess } = useProjectFile(projectId, fileId)
+
+  async function download() {
+    if (!isSuccess || !data) return
+    try {
+      await triggerProjectFileDownload(data.file, downloadSourceRef?.current)
+    } catch (error) {
+      toast.error(getErrorMessage(error, 'Unable to download this file'))
+    }
+  }
+
+  return (
+    <>
+      <Tooltip.Root>
+        <Tooltip.Trigger asChild>
+          <TabStripAction
+            variant='subtle'
+            disabled={!isSuccess || !data}
+            onClick={() =>
+              router.push(
+                `/projects/${encodeURIComponent(projectId)}/files/${encodeURIComponent(fileId)}`
+              )
+            }
+            aria-label='Open in files'
+          >
+            <SquareArrowUpRight className={RESOURCE_TAB_ICON_CLASS} />
+          </TabStripAction>
+        </Tooltip.Trigger>
+        <Tooltip.Content side='bottom'>Open in files</Tooltip.Content>
+      </Tooltip.Root>
+      <Tooltip.Root>
+        <Tooltip.Trigger asChild>
+          <TabStripAction
+            variant='subtle'
+            onClick={() => void download()}
+            disabled={!isSuccess || !data}
+            aria-label='Download file'
+          >
+            <Download className={RESOURCE_TAB_ICON_CLASS} />
+          </TabStripAction>
+        </Tooltip.Trigger>
+        <Tooltip.Content side='bottom'>Download</Tooltip.Content>
+      </Tooltip.Root>
+    </>
+  )
+}
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 e6b70362da4..9e750ea837a 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
@@ -45,6 +45,11 @@ import { ShareModal } from '@/app/workspace/[workspaceId]/files/components/share
 import type { BrowserPanelOverlayController } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-panel-occlusion'
 import { BrowserSession } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session'
 import { GenericResourceContent } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/generic-resource-content'
+import {
+  EmbeddedProjectFile,
+  ProjectFileActions,
+} from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file'
+import { EmbeddedProjectFileFolder } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/project-file-folder'
 import { TerminalSession } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/terminal-session/terminal-session'
 import { RESOURCE_TAB_ICON_CLASS } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tab-controls'
 import { hasRenderableFilePreviewContent } from '@/app/workspace/[workspaceId]/home/hooks/preview'
@@ -112,7 +117,7 @@ function useOpenInternalLink() {
 }
 
 interface ResourceContentProps {
-  workspaceId: string
+  workspaceId?: string
   desktopScopeId: string
   onTableViewContextChange?: (tableId: string, context: MothershipTableViewContext) => void
   resource: MothershipResource
@@ -237,17 +242,17 @@ export const ResourceContent = memo(function ResourceContent({
     const type = SOURCE_MIME_MAP[ext] ?? getMimeTypeFromExtension(ext)
     return {
       id: 'streaming-file',
-      workspaceId,
       name: streamFileName,
       key: '',
       path: '',
       size: 0,
       type,
       uploadedBy: '',
+      folderId: null,
       uploadedAt: STREAMING_EPOCH,
       updatedAt: STREAMING_EPOCH,
     }
-  }, [workspaceId, streamFileName])
+  }, [streamFileName])
 
   const disableStreamingAutoScroll = previewSession?.operation === 'patch'
   // `append`/`patch` stream complete full-file snapshots (built on the existing file), so the editor
@@ -274,10 +279,11 @@ export const ResourceContent = memo(function ResourceContent({
   )
 
   if (resource.id === 'streaming-file') {
+    if (!workspaceId) return null
     return (
       <div className='flex h-full flex-col overflow-hidden'>
         <FileViewer
-          file={syntheticFile}
+          file={{ ...syntheticFile, workspaceId }}
           workspaceId={workspaceId}
           canEdit={false}
           previewMode={previewMode ?? 'preview'}
@@ -291,6 +297,28 @@ export const ResourceContent = memo(function ResourceContent({
     )
   }
 
+  if (resource.type === 'filefolder' && resource.owner?.entityType === 'project') {
+    return (
+      <EmbeddedProjectFileFolder
+        key={`${resource.owner.entityId}/${resource.id}`}
+        owner={{ entityType: 'project', entityId: resource.owner.entityId }}
+        folderId={resource.id}
+      />
+    )
+  }
+  if (resource.type === 'file' && resource.owner?.entityType === 'project') {
+    return (
+      <EmbeddedProjectFile
+        key={`${resource.owner.entityId}/${resource.id}`}
+        projectId={resource.owner.entityId}
+        fileId={resource.id}
+        downloadSourceRef={downloadSourceRef}
+        previewMode={previewMode}
+      />
+    )
+  }
+  if (!workspaceId) return null
+
   switch (resource.type) {
     case 'table':
       return (
@@ -382,7 +410,7 @@ export const ResourceContent = memo(function ResourceContent({
 })
 
 interface ResourceActionsProps {
-  workspaceId: string
+  workspaceId?: string
   resource: MothershipResource
   downloadSourceRef?: React.MutableRefObject<FileDownloadSource | null>
 }
@@ -392,6 +420,17 @@ export function ResourceActions({
   resource,
   downloadSourceRef,
 }: ResourceActionsProps) {
+  if (resource.type === 'file' && resource.owner?.entityType === 'project') {
+    return (
+      <ProjectFileActions
+        projectId={resource.owner.entityId}
+        fileId={resource.id}
+        downloadSourceRef={downloadSourceRef}
+      />
+    )
+  }
+  if (!workspaceId) return null
+
   switch (resource.type) {
     case 'workflow':
       return <EmbeddedWorkflowActions workspaceId={workspaceId} workflowId={resource.id} />
@@ -733,7 +772,7 @@ function EmbeddedFileActions({
               key={file.id}
               open
               onOpenChange={setIsShareOpen}
-              workspaceId={workspaceId}
+              owner={{ entityType: 'workspace', entityId: workspaceId }}
               fileId={file.id}
               fileName={file.name}
               initialShare={file.share ?? null}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts
index 6962cdab5f8..419e129d876 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-invalidation.ts
@@ -9,8 +9,8 @@ import { invalidateWorkflowLists } from '@/hooks/queries/utils/invalidate-workfl
 import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 import { tableKeys } from '@/hooks/queries/utils/table-keys'
 import { workflowKeys } from '@/hooks/queries/utils/workflow-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 import { workspaceFileFolderKeys } from '@/hooks/queries/workspace-file-folders'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
 
 function invalidate(client: QueryClient, key: QueryKey): void {
   void client.invalidateQueries({ queryKey: key })
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
index 99cbbc3bf53..a30a007ea5c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
@@ -461,7 +461,8 @@ export function ResourceTabs({
           )
           continue
         }
-        onRemoveResource(r.type, r.id, r.workspaceId)
+        if (r.owner) onRemoveResource(r.type, r.id, r.workspaceId, r.owner)
+        else onRemoveResource(r.type, r.id, r.workspaceId)
         if (r.type === 'browser') {
           sendBrowserPanelAction('close-tab', { tabId: r.id }, desktopScopeId)
         }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.test.tsx
new file mode 100644
index 00000000000..620286b91d9
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view.test.tsx
@@ -0,0 +1,120 @@
+/** @vitest-environment jsdom */
+
+import { act } from 'react'
+import { authClientMock } from '@sim/testing/mocks/auth-client.mock'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { createRoot } from 'react-dom/client'
+import { afterEach, expect, it, vi } from 'vitest'
+import { getChatResourceSelectionId } from '@/lib/mothership/resources/types'
+import { MothershipResourcesProvider } from '@/app/workspace/[workspaceId]/home/components/mothership-resources-context'
+import { MothershipView } from '@/app/workspace/[workspaceId]/home/components/mothership-view/mothership-view'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
+
+vi.mock('@/lib/auth/auth-client', () => authClientMock)
+
+vi.mock('@/app/workspace/[workspaceId]/home/components/mothership-view/components', () => ({
+  ResourceTabs: () => null,
+  ResourceActions: () => null,
+  ResourceContent: () => <div data-testid='private-file' />,
+}))
+vi.mock('@/app/workspace/[workspaceId]/files/components/file-viewer', () => ({
+  isCsvStreamOnly: () => false,
+  isMarkdownFile: () => false,
+  isPreviewable: () => false,
+  RICH_PREVIEWABLE_EXTENSIONS: new Set(),
+}))
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/browser-session/browser-session',
+  () => ({ BrowserSession: () => null })
+)
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/terminal-session/terminal-session',
+  () => ({ TerminalSession: () => null })
+)
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/generic-resource-content',
+  () => ({ GenericResourceContent: () => null })
+)
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/search-resource-content',
+  () => ({ SearchResourceContent: () => null })
+)
+vi.mock(
+  '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/components/sources-resource-content',
+  () => ({ SourcesResourceContent: () => null })
+)
+
+const mounted: ReturnType<typeof createRoot>[] = []
+afterEach(async () => {
+  await act(async () => {
+    for (const root of mounted.splice(0)) root.unmount()
+  })
+  document.body.innerHTML = ''
+})
+
+it.each([
+  [false, true],
+  [true, false],
+  [false, false],
+  [true, true],
+])(
+  'only activates a persisted Project tab when projects=%s and project-files=%s are both enabled',
+  async (projects, projectFiles) => {
+    const client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    const resource = {
+      type: 'file' as const,
+      id: 'file',
+      title: 'notes.txt',
+      owner: { entityType: 'project' as const, entityId: 'project' },
+    }
+    const options = getProjectFileQueryOptions('project', 'file')
+    client.setQueryData(options.queryKey, {
+      file: { id: 'file', name: 'notes.txt', type: 'text/plain' },
+      capabilities: { canRead: true, canWrite: false },
+    })
+    const container = document.createElement('div')
+    document.body.append(container)
+    const root = createRoot(container)
+    mounted.push(root)
+    await act(async () =>
+      root.render(
+        <QueryClientProvider client={client}>
+          <FeatureFlagsProvider
+            flags={{
+              projects,
+              'project-files': projectFiles,
+              dashboards: false,
+              'table-row-ttl': false,
+              'mothership-model-selector': false,
+              'mothership-plan-mode': false,
+            }}
+          >
+            <MothershipResourcesProvider
+              selectResource={vi.fn()}
+              addResource={vi.fn()}
+              removeResource={vi.fn()}
+              reorderResources={vi.fn()}
+              collapseResource={vi.fn()}
+            >
+              <MothershipView
+                resources={[resource]}
+                activeResourceId={getChatResourceSelectionId(resource)}
+                desktopScopeId='chat'
+                isCollapsed={false}
+                onSummarize={vi.fn()}
+              />
+            </MothershipResourcesProvider>
+          </FeatureFlagsProvider>
+        </QueryClientProvider>
+      )
+    )
+    expect(client.getQueryCache().find({ queryKey: options.queryKey })?.isActive()).toBe(
+      projects && projectFiles
+    )
+    expect(container.querySelector('[data-testid=private-file]') !== null).toBe(
+      projects && projectFiles
+    )
+    client.clear()
+  }
+)
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 9fb538d0330..3469b7c14f8 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
@@ -5,7 +5,10 @@ import { cn } from '@sim/emcn'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership-resources'
 import type { FilePreviewSession } from '@/lib/mothership/request/session'
-import { getChatResourceSelectionId } from '@/lib/mothership/resources/types'
+import {
+  getChatResourceSelectionId,
+  getChatResourceWorkspaceId,
+} from '@/lib/mothership/resources/types'
 import type { FileDownloadSource } from '@/lib/uploads/client/download'
 import { getFileExtension } from '@/lib/uploads/utils/file-utils'
 import { SIM_PAGE_CONTENT_TYPE } from '@/lib/workspace-files/page-compile'
@@ -30,7 +33,9 @@ import type {
   MothershipResource,
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { useProjectFile } from '@/hooks/queries/project-files'
 import { useWorkspacePermissionsQuery } from '@/hooks/queries/workspace'
 import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
 import { useUserPermissions } from '@/hooks/use-user-permissions'
@@ -116,7 +121,7 @@ export const MothershipView = memo(
       allowBuildControls,
       chatId,
       desktopScopeId,
-      resources,
+      resources: persistedResources,
       onTableViewContextChange,
       activeResourceId,
       activityResourceIds,
@@ -129,8 +134,22 @@ export const MothershipView = memo(
     }: MothershipViewProps,
     ref
   ) {
+    const projectsEnabled = useFeatureFlag('projects')
+    const projectFilesEnabled = useFeatureFlag('project-files')
+    const resources =
+      projectsEnabled && projectFilesEnabled
+        ? persistedResources
+        : persistedResources.filter((resource) => resource.owner?.entityType !== 'project')
     const active = resources.find((r) => getChatResourceSelectionId(r) === activeResourceId) ?? null
-    const activeWorkspaceId = active?.workspaceId ?? workspaceId
+    const activeProjectId =
+      active?.type === 'file' && active.owner?.entityType === 'project'
+        ? active.owner.entityId
+        : undefined
+    const activeWorkspaceId = active ? getChatResourceWorkspaceId(active, workspaceId) : workspaceId
+    const projectFile = useProjectFile(
+      activeProjectId,
+      active?.id === 'streaming-file' ? undefined : active?.id
+    )
     const inheritedPermissions = useUserPermissionsContext()
     const permissions = useWorkspacePermissionsQuery(organizationId ? activeWorkspaceId : undefined)
     const scopedPermissions = useUserPermissions(
@@ -138,9 +157,11 @@ export const MothershipView = memo(
       permissions.isPending,
       permissions.error?.message ?? null
     )
-    const canEdit = organizationId
-      ? Boolean(activeWorkspaceId) && !permissions.error && scopedPermissions.canEdit
-      : inheritedPermissions.canEdit
+    const canEdit = activeProjectId
+      ? projectFile.isSuccess && Boolean(projectFile.data.capabilities.canWrite)
+      : organizationId
+        ? Boolean(activeWorkspaceId) && !permissions.error && scopedPermissions.canEdit
+        : inheritedPermissions.canEdit
     const { removeResource } = useMothershipResources()
     const browserOverlayControllerRef = useRef<BrowserPanelOverlayController | null>(null)
     const fileDownloadSourceRef = useRef<FileDownloadSource | null>(null)
@@ -200,7 +221,11 @@ export const MothershipView = memo(
         enabled: Boolean(activeWorkspaceId) && active?.type === 'file',
       }
     )
-    const activeFile = active?.type === 'file' ? files?.find((f) => f.id === active.id) : undefined
+    const activeFile = activeProjectId
+      ? projectFile.data?.file
+      : active?.type === 'file'
+        ? files?.find((f) => f.id === active.id)
+        : undefined
     const isActiveCsv = active?.type === 'file' && getFileExtension(active.title) === 'csv'
 
     const isActivePreviewable =
@@ -216,7 +241,7 @@ export const MothershipView = memo(
       // Only a CSV's previewability depends on its size (large = read-only, no editor). Wait for
       // the record before deciding so the toggle doesn't flash on for a large CSV — but don't gate
       // other rich types (html, svg, …) on the file list loading.
-      !(isActiveCsv && filesLoading) &&
+      !(isActiveCsv && (activeProjectId ? projectFile.isPending : filesLoading)) &&
       !(activeFile && isCsvStreamOnly(activeFile)) &&
       // A Sim page is locked to its rendered view (the pdf model — the raw
       // source is not a mode this surface offers), so no toggle either.
@@ -240,7 +265,9 @@ export const MothershipView = memo(
             activeId={active ? getChatResourceSelectionId(active) : null}
             activityIds={activityResourceIds}
             actions={
-              active && active.type !== 'search' && activeWorkspaceId ? (
+              activeProjectId && active ? (
+                <ResourceActions resource={active} downloadSourceRef={fileDownloadSourceRef} />
+              ) : active && active.type !== 'search' && activeWorkspaceId ? (
                 <ResourceWorkspaceHost
                   workspaceId={activeWorkspaceId}
                   organizationId={organizationId}
@@ -343,6 +370,11 @@ function ScopedResourceContent({
 }) {
   if (props.resource.type === 'search')
     return <SearchResourceContent resource={props.resource} onSummarize={onSummarize} />
+  if (
+    (props.resource.type === 'file' || props.resource.type === 'filefolder') &&
+    props.resource.owner?.entityType === 'project'
+  )
+    return <ResourceContent {...props} />
   if (!workspaceId) {
     if (props.resource.type === 'generic') return <GenericResourceContent />
     if (props.resource.type === 'browser')
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
index 6dd16b811f4..0ac468ad96b 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/chip-clipboard-codec.ts
@@ -1,4 +1,5 @@
 import { isWorkspaceOwnedContext } from '@/lib/mothership/chat/context-ownership'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import {
   computeMentionHighlightRanges,
   extractContextTokens,
@@ -30,6 +31,7 @@ const PORTABLE_KIND_TO_ID_FIELD = {
   folder: 'folderId',
   filefolder: 'fileFolderId',
   workspace: 'workspaceId',
+  project: 'projectId',
   knowledge: 'knowledgeId',
   past_chat: 'chatId',
   workflow: 'workflowId',
@@ -46,13 +48,6 @@ const PORTABLE_KIND_TO_ID_FIELD = {
  */
 export type PortableKind = keyof typeof PORTABLE_KIND_TO_ID_FIELD
 
-/**
- * Carries the owning workspace of a resource chip, which an organization chat
- * needs to resolve it: `sim:kind/id?workspace=<owner>`. Links without it parse
- * exactly as before.
- */
-const OWNER_PARAM = '?workspace='
-
 /**
  * Decodes a link's owner, or `null` when it is not valid percent-encoding —
  * such a link was not written by this codec, so it stays plain text.
@@ -70,11 +65,13 @@ export function serializePortableChipLink(
   kind: PortableKind,
   id: string,
   label: string,
-  workspaceId?: string
+  owner?: string | FileOperationOwner
 ): string {
   const escapedLabel = label.replace(/[\\[\]]/g, '\\$&')
-  const owner = workspaceId ? `${OWNER_PARAM}${encodeURIComponent(workspaceId)}` : ''
-  return `[${escapedLabel}](${CHIP_LINK_SCHEME}:${kind}/${id}${owner})`
+  const entityType = typeof owner === 'string' ? 'workspace' : owner?.entityType
+  const entityId = typeof owner === 'string' ? owner : owner?.entityId
+  const ownerQuery = entityType && entityId ? `?${entityType}=${encodeURIComponent(entityId)}` : ''
+  return `[${escapedLabel}](${CHIP_LINK_SCHEME}:${kind}/${id}${ownerQuery})`
 }
 
 function parsePortableChipLabel(label: string): string {
@@ -102,6 +99,7 @@ export interface ParsedChipLink {
   label: string
   /** Owning workspace, carried by resource chips copied from an organization chat. */
   workspaceId?: string
+  owner?: FileOperationOwner
   start: number
   end: number
 }
@@ -140,7 +138,11 @@ function serializeChipContext(context: ChatContext): string | null {
     context.kind,
     id,
     context.label,
-    isWorkspaceOwnedContext(context) ? context.workspaceId : undefined
+    context.kind === 'file' && context.owner
+      ? context.owner
+      : isWorkspaceOwnedContext(context)
+        ? context.workspaceId
+        : undefined
   )
 }
 
@@ -247,14 +249,28 @@ export function parseChipLinks(text: string): ParsedChipLink[] {
   while ((match = pattern.exec(text)) !== null) {
     const [full, label, kind, address] = match
     if (!isPortableKind(kind)) continue
-    const ownerAt = address.lastIndexOf(OWNER_PARAM)
-    const workspaceId =
-      ownerAt === -1 ? undefined : decodeOwner(address.slice(ownerAt + OWNER_PARAM.length))
-    if (workspaceId === null) continue
+    const queryAt = address.indexOf('?')
+    const id = queryAt === -1 ? address : address.slice(0, queryAt)
+    if (!id) continue
+    let workspaceId: string | undefined
+    let owner: FileOperationOwner | undefined
+    if (queryAt !== -1) {
+      const query = /^(workspace|project)=([^&?]+)$/.exec(address.slice(queryAt + 1))
+      if (!query) continue
+      const entityId = decodeOwner(query[2])
+      if (!entityId || entityId.length > 200 || entityId.trim() !== entityId) continue
+      if (query[1] === 'project') {
+        if (kind !== 'file') continue
+        owner = { entityType: 'project', entityId }
+      } else {
+        workspaceId = entityId
+      }
+    }
     links.push({
       kind,
-      id: ownerAt === -1 ? address : address.slice(0, ownerAt),
+      id,
       ...(workspaceId ? { workspaceId } : {}),
+      ...(owner ? { owner } : {}),
       label: parsePortableChipLabel(label),
       start: match.index,
       end: match.index + full.length,
@@ -275,6 +291,7 @@ export function parseChipLinks(text: string): ParsedChipLink[] {
  */
 export function chipLinkToContext(link: ParsedChipLink): ChatContext {
   const context = chipLinkBaseContext(link)
+  if (context.kind === 'file' && link.owner) return { ...context, owner: link.owner }
   return link.workspaceId && isWorkspaceOwnedContext(context)
     ? { ...context, workspaceId: link.workspaceId }
     : context
@@ -292,6 +309,8 @@ function chipLinkBaseContext(link: ParsedChipLink): ChatContext {
       return { kind: 'folder', folderId: link.id, label: link.label }
     case 'filefolder':
       return { kind: 'filefolder', fileFolderId: link.id, label: link.label }
+    case 'project':
+      return { kind: 'project', projectId: link.id, label: link.label }
     case 'workspace':
       return { kind: 'workspace', workspaceId: link.id, label: link.label }
     case 'knowledge':
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx
new file mode 100644
index 00000000000..ce57a0a0e07
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.test.tsx
@@ -0,0 +1,140 @@
+/** @vitest-environment jsdom */
+import { act, createRef } from 'react'
+import { createDeferred } from '@sim/testing/helpers/deferred'
+import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { createRoot, type Root } from 'react-dom/client'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { PlusMenuHandle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/constants'
+import { PlusMenuDropdown } from '@/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { workspaceKeys } from '@/hooks/queries/workspace'
+
+vi.mock('@/blocks/integration-matcher', () => ({
+  ...integrationMatcherMock,
+  listIntegrationsByPopularity: () => [],
+}))
+
+vi.mock(
+  'next/navigation',
+  async () => (await import('@sim/testing/mocks/next-navigation.mock')).nextNavigationMock
+)
+
+let client: QueryClient
+let root: Root
+let container: HTMLDivElement
+const handle = createRef<PlusMenuHandle>()
+let selected: { id: string; name: string } | null = null
+const selectProject = (project: { id: string; name: string }) => {
+  selected = { id: project.id, name: project.name }
+}
+const project = {
+  id: 'project',
+  name: 'Gate fixture',
+  organizationId: 'organization',
+  ownerId: 'user',
+  archivedAt: null,
+  createdAt: '2026-10-08T00:00:00Z',
+  updatedAt: '2026-10-08T00:00:00Z',
+  environments: [],
+  capabilities: { administer: true, issues: true },
+}
+beforeEach(() => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  vi.useFakeTimers()
+  Element.prototype.scrollIntoView = vi.fn()
+  selected = null
+  client = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  client.setQueryData(workspaceKeys.list(), { workspaces: [] })
+  vi.stubGlobal('fetch', async (input: string) =>
+    Response.json(
+      input.startsWith('/api/projects?') ? { projects: [project], nextCursor: null } : {}
+    )
+  )
+  container = document.createElement('div')
+  document.body.append(container)
+  root = createRoot(container)
+})
+afterEach(async () => {
+  await act(async () => root.unmount())
+  client.clear()
+  container.remove()
+  vi.useRealTimers()
+})
+async function render(projectFiles: boolean) {
+  await act(async () =>
+    root.render(
+      <QueryClientProvider client={client}>
+        <FeatureFlagsProvider
+          flags={{
+            projects: true,
+            'project-files': projectFiles,
+            dashboards: false,
+            'mothership-model-selector': false,
+            'mothership-plan-mode': false,
+          }}
+        >
+          <PlusMenuDropdown
+            ref={handle}
+            workspaceId=''
+            organizationId='organization'
+            warm
+            onResourceSelect={() => {}}
+            onWorkspaceSelect={() => {}}
+            onProjectSelect={selectProject}
+            onClose={() => {}}
+            textareaRef={{ current: null }}
+            pendingCursorRef={{ current: null }}
+            mentionQuery={project.name}
+          />
+        </FeatureFlagsProvider>
+      </QueryClientProvider>
+    )
+  )
+  await act(async () => vi.advanceTimersByTimeAsync(10))
+}
+it('stops cached Project mention selection when Project files are disabled', async () => {
+  await render(true)
+  await act(async () => handle.current?.open({ left: 0, top: 0 }, { mention: true }))
+  await act(async () => handle.current?.selectActive())
+  expect(selected).toEqual(expect.objectContaining({ id: project.id, name: project.name }))
+  selected = null
+  await render(false)
+  await act(async () => handle.current?.open({ left: 0, top: 0 }, { mention: true }))
+  await act(async () => handle.current?.selectActive())
+  expect(selected).toBeNull()
+})
+it('stops Project tagging through the browse submenu when Project files are disabled', async () => {
+  await render(true)
+  await act(async () => handle.current?.open({ left: 0, top: 0 }))
+  const selectProject = async () => {
+    const trigger = Array.from(document.querySelectorAll<HTMLElement>('[role="menuitem"]')).find(
+      (item) => item.textContent === project.name
+    )
+    if (!trigger) throw new Error('Project fixture was not available for environment browsing')
+    await act(async () => trigger.click())
+  }
+  await selectProject()
+  expect(selected).toEqual(expect.objectContaining({ id: project.id }))
+  selected = null
+  await render(false)
+  await act(async () => handle.current?.open({ left: 0, top: 0 }))
+  await selectProject()
+  expect(selected).toBeNull()
+})
+
+it('only waits for pending Projects when Project mentions are selectable', async () => {
+  const response = createDeferred<Response>()
+  vi.stubGlobal('fetch', (input: string) =>
+    input.startsWith('/api/projects?') ? response.promise : Promise.resolve(Response.json({}))
+  )
+  try {
+    await render(true)
+    await act(async () => handle.current?.open({ left: 0, top: 0 }, { mention: true }))
+    expect(handle.current?.selectActive()).toBe('hydrating')
+    await render(false)
+    expect(handle.current?.selectActive()).toBe('empty')
+  } finally {
+    await act(async () => response.resolve(Response.json({ projects: [], nextCursor: null })))
+  }
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
index 3759f6e3d81..33471d99091 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/plus-menu-dropdown.tsx
@@ -12,9 +12,13 @@ import {
   dropdownMenuRowClass,
   OverflowText,
 } from '@sim/emcn'
+import { Folder } from '@sim/emcn/icons'
 import { IdentityTile } from '@/components/identity-tile/identity-tile'
+import type { Project } from '@/lib/api/contracts/projects'
+import { getChatResourceKey } from '@/lib/mothership/resources/types'
 import { getWorkspaceInitial } from '@/lib/workspaces/initials'
 import {
+  ProjectResourceSubmenu,
   ResourceMenuSections,
   resourceFromItem,
   useAvailableResources,
@@ -26,6 +30,7 @@ import {
   mergeOrganizationResourceInventories,
   OrganizationResourceInventory,
 } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/organization-resource-inventory'
+import { useAvailableProjectInventories } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/project-resources'
 import {
   byResourceMenuOrder,
   getResourceConfig,
@@ -44,6 +49,8 @@ import type {
   MothershipResource,
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
+import { useProjectInventory } from '@/hooks/queries/projects'
 import { useOrderedWorkspacesQuery, type Workspace } from '@/hooks/queries/workspace'
 import { useSettledTerminalCommands } from '@/hooks/use-settled-terminal-commands'
 import { useBrowserSessionStore } from '@/stores/browser-session/store'
@@ -60,10 +67,13 @@ const RESOURCE_MENU_WIDTH_CLASS = 'w-[360px] min-w-0 max-w-[min(360px,calc(100vw
 
 type MentionCandidate =
   | ResourceMentionCandidate
+  | { type: 'project'; item: Pick<Project, 'id' | 'name'> }
   | { type: 'workspace'; item: Pick<Workspace, 'id' | 'name' | 'logoUrl'> }
 
 function candidateKey({ type, item }: MentionCandidate): string {
-  return `${type}:${'workspaceId' in item ? item.workspaceId : ''}:${item.id}`
+  return type === 'workspace' || type === 'project'
+    ? `${type}:${item.id}`
+    : getChatResourceKey(resourceFromItem(type, item))
 }
 
 /**
@@ -95,6 +105,7 @@ function isNativeResourceGroup({ type }: { type: MothershipResourceType }): bool
 
 const EMPTY_BROWSER_TABS = [] as const
 const EMPTY_TERMINAL_TABS = [] as const
+const EMPTY_PROJECTS: Project[] = []
 
 interface PlusMenuDropdownProps {
   workspaceId: string
@@ -110,6 +121,7 @@ interface PlusMenuDropdownProps {
   onResourceSelect: (resource: MothershipResource) => void
   /** Tags a whole workspace; offered only in organization chats. */
   onWorkspaceSelect: (workspace: { id: string; name: string }) => void
+  onProjectSelect: (project: { id: string; name: string }) => void
   onClose: () => void
   textareaRef: React.RefObject<HTMLTextAreaElement | null>
   pendingCursorRef: React.MutableRefObject<number | null>
@@ -125,6 +137,7 @@ export const PlusMenuDropdown = React.memo(
       warm,
       onResourceSelect,
       onWorkspaceSelect,
+      onProjectSelect,
       onClose,
       textareaRef,
       pendingCursorRef,
@@ -155,6 +168,14 @@ export const PlusMenuDropdown = React.memo(
       enabled: inventoryEnabled,
       includeFolderMentions: true,
     })
+    const projectsEnabled = useFeatureFlag('projects')
+    const projectFilesEnabled = useFeatureFlag('project-files')
+    const projectSelectionEnabled = projectsEnabled && projectFilesEnabled
+    const projectQuery = useProjectInventory(organizationId, inventoryEnabled && projectsEnabled)
+    const projects =
+      projectsEnabled && !projectQuery.isError
+        ? (projectQuery.data ?? EMPTY_PROJECTS)
+        : EMPTY_PROJECTS
     const { data: allWorkspaces, isPending: workspacesPending } = useOrderedWorkspacesQuery(
       Boolean(organizationId) && inventoryEnabled
     )
@@ -171,8 +192,12 @@ export const PlusMenuDropdown = React.memo(
         current[workspaceId] === inventory ? current : { ...current, [workspaceId]: inventory }
       )
     }, [])
+    const projectInventories = useAvailableProjectInventories({
+      projects,
+      enabled: inventoryEnabled && Boolean(organizationId),
+    })
     const combined = organizationId
-      ? mergeOrganizationResourceInventories(workspaces, inventories)
+      ? mergeOrganizationResourceInventories(workspaces, inventories, projects, projectInventories)
       : workspaceInventory
     const { structureFolders } = combined
     const availableResources = organizationId
@@ -180,7 +205,11 @@ export const PlusMenuDropdown = React.memo(
           byResourceMenuOrder
         )
       : combined.groups
-    const isHydrating = combined.isHydrating || Boolean(organizationId && workspacesPending)
+    const isHydrating =
+      combined.isHydrating ||
+      Boolean(
+        organizationId && (workspacesPending || (projectSelectionEnabled && projectQuery.isPending))
+      )
 
     const doOpen = useCallback(
       (anchor: { left: number; top: number }, options?: { mention?: boolean }) => {
@@ -233,6 +262,15 @@ export const PlusMenuDropdown = React.memo(
     const filteredItems = useMemo((): MentionCandidate[] | null => {
       const q = query.toLowerCase().trim()
       if (!isMention && !q) return null
+      const projectItems: MentionCandidate[] = (
+        projectSelectionEnabled
+          ? q
+            ? projects
+            : projects.slice(0, MENTION_PREVIEW_DEFAULT_LIMIT)
+          : EMPTY_PROJECTS
+      )
+        .filter((project) => project.name.toLowerCase().includes(q))
+        .map((item) => ({ type: 'project', item }))
       const workspaceItems: MentionCandidate[] = (
         q ? workspaces : workspaces.slice(0, MENTION_PREVIEW_DEFAULT_LIMIT)
       )
@@ -246,8 +284,8 @@ export const PlusMenuDropdown = React.memo(
             visibleResources,
             (type) => getResourceConfig(type).mentionPreviewLimit ?? MENTION_PREVIEW_DEFAULT_LIMIT
           )
-      return [...workspaceItems, ...resourceItems]
-    }, [isMention, query, visibleResources, workspaces])
+      return [...projectItems, ...workspaceItems, ...resourceItems]
+    }, [isMention, query, visibleResources, workspaces, projects, projectSelectionEnabled])
 
     const activeIndex = Math.max(
       0,
@@ -294,8 +332,14 @@ export const PlusMenuDropdown = React.memo(
       closeAfterSelect()
     }
 
+    const handleProjectSelect = (project: { id: string; name: string }) => {
+      onProjectSelect(project)
+      closeAfterSelect()
+    }
+
     const handleCandidateSelect = (candidate: MentionCandidate) => {
       if (candidate.type === 'workspace') handleWorkspaceSelect(candidate.item)
+      else if (candidate.type === 'project') handleProjectSelect(candidate.item)
       else handleSelect(resourceFromItem(candidate.type, candidate.item))
     }
     const handleSelectRef = useRef(handleCandidateSelect)
@@ -414,6 +458,7 @@ export const PlusMenuDropdown = React.memo(
               onChange={receiveInventory}
             />
           ))}
+
         <DropdownMenuTrigger asChild>
           <div
             className='pointer-events-none fixed size-0'
@@ -452,6 +497,21 @@ export const PlusMenuDropdown = React.memo(
                   menu FocusScope steal focus from the search input back to the content root. */}
             <div hidden={filteredItems !== null}>
               {organizationId &&
+                projects.map((project) => (
+                  <ProjectResourceSubmenu
+                    key={project.id}
+                    project={project}
+                    workspaces={workspaces}
+                    onSelectProject={projectSelectionEnabled ? handleProjectSelect : undefined}
+                    excludeTypes={WORKSPACE_SUBMENU_EXCLUDED_TYPES}
+                    selectFolders
+                    onSelect={handleSelect}
+                    onSelectWorkspace={handleWorkspaceSelect}
+                    subContentClassName={RESOURCE_MENU_WIDTH_CLASS}
+                  />
+                ))}
+              {organizationId &&
+                !projectsEnabled &&
                 workspaces.map((workspace) => (
                   <WorkspaceResourceSubmenu
                     key={workspace.id}
@@ -463,6 +523,15 @@ export const PlusMenuDropdown = React.memo(
                     subContentClassName={RESOURCE_MENU_WIDTH_CLASS}
                   />
                 ))}
+              {organizationId && projectsEnabled && !projects.length && (
+                <div className='flex h-[28px] items-center justify-center px-2 text-[var(--text-muted)] text-caption'>
+                  {projectQuery.isPending
+                    ? 'Loading projects'
+                    : projectQuery.isError
+                      ? 'Unable to load projects'
+                      : 'No accessible projects'}
+                </div>
+              )}
               <ResourceMenuSections
                 sections={treeSections}
                 groups={
@@ -478,8 +547,14 @@ export const PlusMenuDropdown = React.memo(
               (filteredItems.length > 0 ? (
                 filteredItems.map((candidate, index) => {
                   const { type, item } = candidate
-                  const config = type === 'workspace' ? null : getResourceConfig(type)
-                  const workspaceName = 'workspaceName' in item ? item.workspaceName : undefined
+                  const config =
+                    type === 'workspace' || type === 'project' ? null : getResourceConfig(type)
+                  const ownerName =
+                    'projectName' in item && item.projectName
+                      ? item.projectName
+                      : 'workspaceName' in item
+                        ? item.workspaceName
+                        : undefined
                   const isActive = index === activeIndex
                   /* Items arrive grouped by family (one group per type, ordered by
                      RESOURCE_MENU_ORDER), so a type change marks a section boundary.
@@ -489,7 +564,14 @@ export const PlusMenuDropdown = React.memo(
                   return (
                     <React.Fragment key={candidateKey(candidate)}>
                       {startsSection && (
-                        <DropdownMenuLabel>{config?.label ?? 'Workspaces'}</DropdownMenuLabel>
+                        <DropdownMenuLabel>
+                          {config?.label ??
+                            (type === 'project'
+                              ? 'Projects'
+                              : projectsEnabled
+                                ? 'Environments'
+                                : 'Workspaces')}
+                        </DropdownMenuLabel>
                       )}
                       <button
                         type='button'
@@ -506,7 +588,12 @@ export const PlusMenuDropdown = React.memo(
                           isActive && 'bg-[var(--surface-hover)]'
                         )}
                       >
-                        {candidate.type === 'workspace' ? (
+                        {candidate.type === 'project' ? (
+                          <>
+                            <Folder className='size-[14px]' />
+                            <DropdownMenuItemLabel label={candidate.item.name} />
+                          </>
+                        ) : candidate.type === 'workspace' ? (
                           <>
                             <IdentityTile
                               initial={getWorkspaceInitial(candidate.item.name)}
@@ -519,9 +606,9 @@ export const PlusMenuDropdown = React.memo(
                             item: candidate.item,
                           })
                         )}
-                        {typeof workspaceName === 'string' && (
+                        {typeof ownerName === 'string' && (
                           <OverflowText
-                            label={workspaceName}
+                            label={ownerName}
                             className='ml-auto max-w-[35%] shrink-0 text-[var(--text-muted)] text-xs'
                           />
                         )}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
index 4a7e45c129f..2c18b52edfe 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown/resource-mention-items.ts
@@ -39,6 +39,7 @@ export function resourceMentionMatches(item: AvailableItem, query: string): bool
   if (!normalized) return true
   return (
     item.name.toLowerCase().includes(normalized) ||
+    (typeof item.projectName === 'string' && item.projectName.toLowerCase().includes(normalized)) ||
     (typeof item.workspaceName === 'string' &&
       item.workspaceName.toLowerCase().includes(normalized)) ||
     (typeof item.mentionFamily === 'string' &&
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
index 63ab704b60f..827c2da190c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/prompt-editor.tsx
@@ -205,6 +205,7 @@ export function PromptEditor({
           data-paste-max-bytes={PASTE_LIMITS.CHAT_BYTES}
           data-paste-max-characters={PASTE_LIMITS.CHAT_CHARACTERS}
           data-paste-selection-context={editor.workspaceId}
+          data-paste-selection-owners={JSON.stringify(editor.selectionOwners)}
           onCopy={editor.handleCopy}
           onCut={readOnly ? undefined : editor.handleCut}
           onSelect={readOnly ? undefined : editor.handleSelectAdjust}
@@ -227,6 +228,7 @@ export function PromptEditor({
             warm={hasFocused}
             onResourceSelect={editor.insertResource}
             onWorkspaceSelect={editor.insertWorkspace}
+            onProjectSelect={editor.insertProject}
             onClose={editor.handlePlusMenuClose}
             textareaRef={editor.textareaRef}
             pendingCursorRef={editor.pendingCursorRef}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.test.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.test.tsx
index 97b5d72f905..7f63b4f4bc7 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.test.tsx
@@ -3,6 +3,7 @@
  */
 import { act, type ReactNode } from 'react'
 import { integrationMatcherMock } from '@sim/testing/mocks/integration-matcher.mock'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { createRoot, type Root } from 'react-dom/client'
 import { describe, expect, it, vi } from 'vitest'
 
@@ -15,6 +16,7 @@ import {
   type UsePromptEditorProps,
   usePromptEditor,
 } from '@/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor'
+import { FeatureFlagsProvider } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { getIntegrationMatcher } from '@/blocks/integration-matcher'
 import type { ChatContext } from '@/stores/panel'
 
@@ -34,6 +36,9 @@ function renderPromptEditor(props: UsePromptEditorProps) {
   const container = document.createElement('div')
   document.body.appendChild(container)
   const root: Root = createRoot(container)
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: Number.POSITIVE_INFINITY } },
+  })
   let latest: ReturnType<typeof usePromptEditor>
 
   function Probe() {
@@ -42,7 +47,22 @@ function renderPromptEditor(props: UsePromptEditorProps) {
   }
 
   function Wrapper({ children }: { children: ReactNode }) {
-    return <>{children}</>
+    return (
+      <QueryClientProvider client={queryClient}>
+        <FeatureFlagsProvider
+          flags={{
+            projects: false,
+            'project-files': false,
+            dashboards: false,
+            'table-row-ttl': false,
+            'mothership-model-selector': false,
+            'mothership-plan-mode': false,
+          }}
+        >
+          {children}
+        </FeatureFlagsProvider>
+      </QueryClientProvider>
+    )
   }
 
   act(() => {
@@ -62,6 +82,7 @@ function renderPromptEditor(props: UsePromptEditorProps) {
     textarea,
     unmount: () => {
       act(() => root.unmount())
+      queryClient.clear()
       container.remove()
       textarea.remove()
     },
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
index f2f98aa2875..de151603d38 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/prompt-editor/use-prompt-editor.ts
@@ -7,6 +7,7 @@ import {
   attachSelectionContextToClipboard,
   readSelectionContextFromClipboard,
 } from '@/lib/mothership/chat/selection-clipboard'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import { isBuiltinSkillId } from '@/lib/workflows/skills/builtin-skills'
 import { snapSelectionToChips } from '@/app/workspace/[workspaceId]/home/components/user-input/chip-selection'
 import {
@@ -23,6 +24,7 @@ import {
 import type { SkillsMenuHandle } from '@/app/workspace/[workspaceId]/home/components/user-input/components/skills-menu-dropdown/skills-menu-dropdown'
 import { useSkillAutoMention } from '@/app/workspace/[workspaceId]/home/components/user-input/hooks/use-skill-auto-mention'
 import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import {
   useContextManagement,
   useIntegrationAutoMention,
@@ -38,7 +40,10 @@ import {
   uniqueContextLabel,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils'
 import { type McpServer, useMcpToolServers } from '@/hooks/queries/mcp'
+import { useWorkspaceProject } from '@/hooks/queries/project-files'
+import { useProjectInventory } from '@/hooks/queries/projects'
 import { type SkillDefinition, useSkills } from '@/hooks/queries/skills'
+import { useOrderedWorkspacesQuery } from '@/hooks/queries/workspace'
 import type { ChatContext } from '@/stores/panel'
 
 /**
@@ -178,6 +183,48 @@ export function usePromptEditor({
 }: UsePromptEditorProps) {
   const contextsEnabledRef = useRef(contextsEnabled)
   contextsEnabledRef.current = contextsEnabled
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
+  const projectSelectionsEnabled = projectsEnabled && projectFilesEnabled
+  const { data: workspaceProject } = useWorkspaceProject(
+    contextsEnabled && projectSelectionsEnabled && !organizationId ? workspaceId : undefined
+  )
+  const { data: projects } = useProjectInventory(
+    organizationId,
+    contextsEnabled && projectSelectionsEnabled
+  )
+  const { data: workspaces } = useOrderedWorkspacesQuery(contextsEnabled && Boolean(organizationId))
+  const selectionOwners = useMemo(() => {
+    const owners: FileOperationOwner[] = []
+    if (!contextsEnabled) return owners
+    if (workspaceId) owners.push({ entityType: 'workspace', entityId: workspaceId })
+    if (organizationId) {
+      for (const workspace of workspaces ?? []) {
+        if (workspace.organizationId === organizationId && workspace.id !== workspaceId)
+          owners.push({ entityType: 'workspace', entityId: workspace.id })
+      }
+      for (const project of projectSelectionsEnabled ? (projects ?? []) : []) {
+        if (project.organizationId === organizationId && !project.archivedAt)
+          owners.push({ entityType: 'project', entityId: project.id })
+      }
+    } else if (
+      projectSelectionsEnabled &&
+      workspaceProject &&
+      !workspaceProject.project.archivedAt &&
+      workspaceProject.project.environments.some((environment) => environment.id === workspaceId)
+    ) {
+      owners.push({ entityType: 'project', entityId: workspaceProject.project.id })
+    }
+    return owners
+  }, [
+    contextsEnabled,
+    workspaceId,
+    organizationId,
+    projectSelectionsEnabled,
+    projects,
+    workspaces,
+    workspaceProject,
+  ])
   const { data: queriedSkills = [], isPlaceholderData: skillsAreStale } = useSkills(
     contextsEnabled ? workspaceId : ''
   )
@@ -514,9 +561,17 @@ export function usePromptEditor({
 
   const insertResource = useCallback(
     (resource: MothershipResource, selected = contextManagementRef.current.selectedContexts) => {
-      const mapped = mapResourceToContext(resource)
+      let mapped = mapResourceToContext(resource)
       if (!mapped) return
-      const ownerWorkspaceId = resource.workspaceId ?? workspaceIdRef.current
+      if (resource.owner && resource.owner.entityType !== 'workspace') {
+        if (resource.owner.entityType !== 'project' || mapped.kind !== 'file') return
+        mapped = { ...mapped, owner: { entityType: 'project', entityId: resource.owner.entityId } }
+        return insertMention(mapped, selected)
+      }
+      const ownerWorkspaceId =
+        resource.owner?.entityId ?? resource.workspaceId ?? workspaceIdRef.current
+      if (mapped.kind === 'file' && resource.owner)
+        mapped = { ...mapped, owner: { entityType: 'workspace', entityId: ownerWorkspaceId } }
       return insertMention(
         organizationId && ownerWorkspaceId && isWorkspaceOwnedContext(mapped)
           ? { ...mapped, workspaceId: ownerWorkspaceId }
@@ -527,7 +582,17 @@ export function usePromptEditor({
     [insertMention, organizationId]
   )
 
-  /** Tags a whole workspace in an organization chat: "I'm working in this one". */
+  /** Tags shared Project context without selecting an environment. */
+  const insertProject = useCallback(
+    (project: { id: string; name: string }) => {
+      insertMention(
+        { kind: 'project', projectId: project.id, label: project.name },
+        contextManagementRef.current.selectedContexts
+      )
+    },
+    [insertMention]
+  )
+
   const insertWorkspace = useCallback(
     (workspace: { id: string; name: string }) => {
       insertMention(
@@ -1120,140 +1185,143 @@ export function usePromptEditor({
     syncSlashState(textarea, textarea.value, focusPos)
   }, [textareaRef, mentionTokens, adoptDomValue, syncMentionState, syncSlashState])
 
-  const handlePaste = useCallback((e: React.ClipboardEvent<HTMLTextAreaElement>) => {
-    const textarea = e.currentTarget
-    const pastedPlainText = e.clipboardData?.getData('text/plain') ?? ''
-    // A selection copied from a file/table (Cmd+C) carries its context on a
-    // custom clipboard type — paste it as a reference chip instead of plain text.
-    // Registers via `addContext` (not the notified path) so paste never opens a
-    // side panel, matching the portable-chip-link paste below.
-    //
-    // `preventDefault` waits until there is a chip to insert: when the selection
-    // is already attached there is nothing to add, and claiming the event anyway
-    // would swallow the keystroke entirely — no chip and no text. Falling through
-    // pastes the selection's plain text, which is what the user asked for.
-    const selectionContext = contextsEnabledRef.current
-      ? readSelectionContextFromClipboard(e.clipboardData, workspaceIdRef.current)
-      : null
-    const preparedSelection = selectionContext
-      ? prepareContextForInsert(selectionContext, contextManagementRef.current.selectedContexts)
-      : null
-    if (preparedSelection) {
-      e.preventDefault()
-      const selStart = textarea.selectionStart ?? valueRef.current.length
-      const selEnd = textarea.selectionEnd ?? selStart
-      const needsSpaceBefore = selStart > 0 && !/\s/.test(valueRef.current.charAt(selStart - 1))
-      const insert = `${needsSpaceBefore ? ' ' : ''}@${preparedSelection.label} `
-      textarea.setRangeText(insert, selStart, selEnd, 'end')
-      const caret = selStart + insert.length
-      contextManagementRef.current.addContext(preparedSelection)
-      valueRef.current = textarea.value
-      setValueState(textarea.value)
-      requestAnimationFrame(() => textarea.setSelectionRange(caret, caret))
-      return
-    }
-
-    if (pastedPlainText) {
-      const admission = assessTextPaste({
-        pastedText: pastedPlainText,
-        maxPastedBytes: PASTE_LIMITS.CHAT_BYTES,
-        maxPastedCharacters: PASTE_LIMITS.CHAT_CHARACTERS,
-        currentText: textarea.value,
-        selectionStart: textarea.selectionStart,
-        selectionEnd: textarea.selectionEnd,
-        maxResultBytes: PASTE_LIMITS.CHAT_BYTES,
-        maxResultCharacters: PASTE_LIMITS.CHAT_CHARACTERS,
-      })
-      if (!admission.accepted) {
+  const handlePaste = useCallback(
+    (e: React.ClipboardEvent<HTMLTextAreaElement>) => {
+      const textarea = e.currentTarget
+      const pastedPlainText = e.clipboardData?.getData('text/plain') ?? ''
+      // A selection copied from a file/table (Cmd+C) carries its context on a
+      // custom clipboard type — paste it as a reference chip instead of plain text.
+      // Registers via `addContext` (not the notified path) so paste never opens a
+      // side panel, matching the portable-chip-link paste below.
+      //
+      // `preventDefault` waits until there is a chip to insert: when the selection
+      // is already attached there is nothing to add, and claiming the event anyway
+      // would swallow the keystroke entirely — no chip and no text. Falling through
+      // pastes the selection's plain text, which is what the user asked for.
+      const selectionContext = contextsEnabledRef.current
+        ? readSelectionContextFromClipboard(e.clipboardData, selectionOwners)
+        : null
+      const preparedSelection = selectionContext
+        ? prepareContextForInsert(selectionContext, contextManagementRef.current.selectedContexts)
+        : null
+      if (preparedSelection) {
         e.preventDefault()
-        toast.warning('Paste is too large for a message', {
-          description: `Messages support up to ${PASTE_LIMITS.CHAT_CHARACTERS.toLocaleString()} characters. Attach the content as a file to send more without slowing the editor.`,
-        })
+        const selStart = textarea.selectionStart ?? valueRef.current.length
+        const selEnd = textarea.selectionEnd ?? selStart
+        const needsSpaceBefore = selStart > 0 && !/\s/.test(valueRef.current.charAt(selStart - 1))
+        const insert = `${needsSpaceBefore ? ' ' : ''}@${preparedSelection.label} `
+        textarea.setRangeText(insert, selStart, selEnd, 'end')
+        const caret = selStart + insert.length
+        contextManagementRef.current.addContext(preparedSelection)
+        valueRef.current = textarea.value
+        setValueState(textarea.value)
+        requestAnimationFrame(() => textarea.setSelectionRange(caret, caret))
         return
       }
-    }
 
-    // Portable chip links (`[label](sim:kind/id)`) re-create their chip on
-    // paste-back. Rewrite each link span to its `@label ` token (the trailing
-    // space is REQUIRED so useContextManagement's pruning doesn't purge the
-    // freshly-added context) and register the contexts directly.
-    const pastedText = pastedPlainText
-    const links = contextsEnabledRef.current ? parseChipLinks(pastedText) : []
-    if (links.length > 0) {
-      e.preventDefault()
+      if (pastedPlainText) {
+        const admission = assessTextPaste({
+          pastedText: pastedPlainText,
+          maxPastedBytes: PASTE_LIMITS.CHAT_BYTES,
+          maxPastedCharacters: PASTE_LIMITS.CHAT_CHARACTERS,
+          currentText: textarea.value,
+          selectionStart: textarea.selectionStart,
+          selectionEnd: textarea.selectionEnd,
+          maxResultBytes: PASTE_LIMITS.CHAT_BYTES,
+          maxResultCharacters: PASTE_LIMITS.CHAT_CHARACTERS,
+        })
+        if (!admission.accepted) {
+          e.preventDefault()
+          toast.warning('Paste is too large for a message', {
+            description: `Messages support up to ${PASTE_LIMITS.CHAT_CHARACTERS.toLocaleString()} characters. Attach the content as a file to send more without slowing the editor.`,
+          })
+          return
+        }
+      }
+
+      // Portable chip links (`[label](sim:kind/id)`) re-create their chip on
+      // paste-back. Rewrite each link span to its `@label ` token (the trailing
+      // space is REQUIRED so useContextManagement's pruning doesn't purge the
+      // freshly-added context) and register the contexts directly.
+      const pastedText = pastedPlainText
+      const links = contextsEnabledRef.current ? parseChipLinks(pastedText) : []
+      if (links.length > 0) {
+        e.preventDefault()
 
-      const pastedContexts: ChatContext[] = []
-      let rewritten = ''
-      let cursor = 0
-      for (let i = 0; i < links.length; i++) {
-        const link = links[i]
-        let between = pastedText.slice(cursor, link.start)
-        // Self-heal: a run of plain spaces sitting ENTIRELY between two chips is
-        // glue the codec re-emits, so collapse it to one space — gaps accumulated
-        // by earlier pastes clean themselves up. Newlines and prose-bordering
-        // whitespace contain non-space chars and are left verbatim.
-        if (i > 0 && /^ +$/.test(between)) between = ' '
-        rewritten += between
-        const ctx = chipLinkToContext(link)
-        pastedContexts.push(ctx)
-        // Insert the kind-correct token (skill EM-SPACE sentinel, slash `/`, `@`
-        // else) so the chip re-renders with its proper trigger glyph and the
-        // context pruning (keyed on the same per-kind prefix) keeps it. Append
-        // a single separator ONLY when the next source char is non-whitespace
-        // (chip→chip / chip→word); existing whitespace and end-of-string already
-        // supply the boundary, so re-pasting never accumulates spaces.
-        const next = pastedText.charAt(link.end)
-        rewritten += /\S/.test(next) ? `${chipDisplayToken(ctx)} ` : chipDisplayToken(ctx)
-        cursor = link.end
+        const pastedContexts: ChatContext[] = []
+        let rewritten = ''
+        let cursor = 0
+        for (let i = 0; i < links.length; i++) {
+          const link = links[i]
+          let between = pastedText.slice(cursor, link.start)
+          // Self-heal: a run of plain spaces sitting ENTIRELY between two chips is
+          // glue the codec re-emits, so collapse it to one space — gaps accumulated
+          // by earlier pastes clean themselves up. Newlines and prose-bordering
+          // whitespace contain non-space chars and are left verbatim.
+          if (i > 0 && /^ +$/.test(between)) between = ' '
+          rewritten += between
+          const ctx = chipLinkToContext(link)
+          pastedContexts.push(ctx)
+          // Insert the kind-correct token (skill EM-SPACE sentinel, slash `/`, `@`
+          // else) so the chip re-renders with its proper trigger glyph and the
+          // context pruning (keyed on the same per-kind prefix) keeps it. Append
+          // a single separator ONLY when the next source char is non-whitespace
+          // (chip→chip / chip→word); existing whitespace and end-of-string already
+          // supply the boundary, so re-pasting never accumulates spaces.
+          const next = pastedText.charAt(link.end)
+          rewritten += /\S/.test(next) ? `${chipDisplayToken(ctx)} ` : chipDisplayToken(ctx)
+          cursor = link.end
+        }
+        rewritten += pastedText.slice(cursor)
+
+        const selStart = textarea.selectionStart ?? valueRef.current.length
+        const selEnd = textarea.selectionEnd ?? selStart
+        const needsSpaceBefore =
+          selStart > 0 &&
+          !/\s/.test(valueRef.current.charAt(selStart - 1)) &&
+          /^[@/\u2003]/.test(rewritten)
+        const insert = needsSpaceBefore ? ` ${rewritten}` : rewritten
+
+        textarea.setRangeText(insert, selStart, selEnd, 'end')
+        const newValue = textarea.value
+        const caret = selStart + insert.length
+
+        // Use addContext directly — NOT the notified path — so pasting does NOT
+        // auto-open host side panels (the notified path fires onContextAdd).
+        for (const ctx of pastedContexts) contextManagementRef.current.addContext(ctx)
+
+        valueRef.current = newValue
+        setValueState(newValue)
+        requestAnimationFrame(() => {
+          textarea.setSelectionRange(caret, caret)
+        })
+        return
       }
-      rewritten += pastedText.slice(cursor)
-
-      const selStart = textarea.selectionStart ?? valueRef.current.length
-      const selEnd = textarea.selectionEnd ?? selStart
-      const needsSpaceBefore =
-        selStart > 0 &&
-        !/\s/.test(valueRef.current.charAt(selStart - 1)) &&
-        /^[@/\u2003]/.test(rewritten)
-      const insert = needsSpaceBefore ? ` ${rewritten}` : rewritten
-
-      textarea.setRangeText(insert, selStart, selEnd, 'end')
-      const newValue = textarea.value
-      const caret = selStart + insert.length
-
-      // Use addContext directly — NOT the notified path — so pasting does NOT
-      // auto-open host side panels (the notified path fires onContextAdd).
-      for (const ctx of pastedContexts) contextManagementRef.current.addContext(ctx)
-
-      valueRef.current = newValue
-      setValueState(newValue)
-      requestAnimationFrame(() => {
-        textarea.setSelectionRange(caret, caret)
-      })
-      return
-    }
 
-    const items = e.clipboardData?.items
-    if (!items) return
+      const items = e.clipboardData?.items
+      if (!items) return
 
-    const pastedFiles: File[] = []
-    for (const item of Array.from(items)) {
-      if (item.kind === 'file') {
-        const file = item.getAsFile()
-        if (file) pastedFiles.push(file)
+      const pastedFiles: File[] = []
+      for (const item of Array.from(items)) {
+        if (item.kind === 'file') {
+          const file = item.getAsFile()
+          if (file) pastedFiles.push(file)
+        }
       }
-    }
 
-    if (pastedFiles.length === 0) return
-    const acceptFiles = onPasteFilesRef.current
-    if (!acceptFiles) return
+      if (pastedFiles.length === 0) return
+      const acceptFiles = onPasteFilesRef.current
+      if (!acceptFiles) return
 
-    e.preventDefault()
-    const dt = new DataTransfer()
-    for (const file of pastedFiles) {
-      dt.items.add(file)
-    }
-    acceptFiles(dt.files)
-  }, [])
+      e.preventDefault()
+      const dt = new DataTransfer()
+      for (const file of pastedFiles) {
+        dt.items.add(file)
+      }
+      acceptFiles(dt.files)
+    },
+    [selectionOwners]
+  )
 
   /**
    * On copy/cut, write a portable representation of the selection to the
@@ -1282,13 +1350,19 @@ export function usePromptEditor({
       const soleSelectionChip =
         selectionChips.length === 1 &&
         selected.replace(chipDisplayToken(selectionChips[0]), '').trim().length === 0
-      if (soleSelectionChip) {
+      const selection = selectionChips[0]
+      if (
+        soleSelectionChip &&
+        (selection.kind === 'file_selection' || selection.kind === 'table_selection')
+      ) {
         e.preventDefault()
         e.clipboardData.setData('text/plain', selected)
         attachSelectionContextToClipboard(
           e.clipboardData,
-          selectionChips[0],
-          workspaceIdRef.current
+          selection,
+          selection.kind === 'file_selection' && selection.owner
+            ? selection.owner
+            : (selection.workspaceId ?? workspaceIdRef.current)
         )
         return true
       }
@@ -1349,6 +1423,7 @@ export function usePromptEditor({
     /** @internal Wiring consumed by the {@link PromptEditor} view. */
     workspaceId,
     organizationId,
+    selectionOwners,
     contextsEnabled,
     /** @internal */
     skills,
@@ -1368,6 +1443,7 @@ export function usePromptEditor({
     insertResource,
     /** @internal */
     insertWorkspace,
+    insertProject,
     /** @internal */
     handleSkillSelect,
     /** @internal */
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 0971951fd9a..33d95f39c62 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -32,9 +32,12 @@ import {
 } from '@/app/workspace/[workspaceId]/home/hooks/use-resource-panel'
 import { useRestoredChatEntry } from '@/app/workspace/[workspaceId]/home/hooks/use-restored-chat-entry'
 import { resolveWorkspaceResourceRef } from '@/app/workspace/[workspaceId]/home/resolve-resource-ref'
+import { useFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
 import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
 import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
-import { getWorkspaceFilesQueryOptions, useWorkspaceFiles } from '@/hooks/queries/workspace-files'
+import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
+import { getWorkspaceFilesQueryOptions } from '@/hooks/queries/utils/workspace-file-query'
+import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
 import { useOAuthReturnRouter } from '@/hooks/use-oauth-return'
 import type { ChatContext } from '@/stores/panel'
 import {
@@ -45,12 +48,7 @@ import {
   type UserInputHandle,
 } from './components'
 import { getMothershipUseChatOptions, useChat } from './hooks'
-import type {
-  FileAttachmentForApi,
-  MothershipResource,
-  MothershipResourceType,
-  WorkspaceResourceRef,
-} from './types'
+import type { FileAttachmentForApi, MothershipResource, WorkspaceResourceRef } from './types'
 
 const logger = createLogger('Home')
 
@@ -72,6 +70,8 @@ export function Home(props: HomeProps) {
 
 function HomeContent({ chatId, userName, userId }: HomeProps) {
   useOAuthReturnRouter()
+  const projectsEnabled = useFeatureFlag('projects')
+  const projectFilesEnabled = useFeatureFlag('project-files')
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const queryClient = useQueryClient()
   const controller = useResourcePanelController()
@@ -304,7 +304,7 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
 
   function resolveResourceFromContext(
     context: ChatContext
-  ): { type: MothershipResourceType; id: string } | null {
+  ): Pick<MothershipResource, 'type' | 'id' | 'owner' | 'workspaceId'> | null {
     switch (context.kind) {
       case 'workflow':
       case 'current_workflow':
@@ -316,9 +316,16 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
       case 'table_selection':
         return context.tableId ? { type: 'table', id: context.tableId } : null
       case 'file':
-        return context.fileId ? { type: 'file', id: context.fileId } : null
       case 'file_selection':
-        return context.fileId ? { type: 'file', id: context.fileId } : null
+        return context.fileId
+          ? {
+              type: 'file',
+              id: context.fileId,
+              owner: context.owner,
+              workspaceId:
+                context.owner?.entityType === 'project' ? undefined : context.workspaceId,
+            }
+          : null
       case 'dashboard':
         return { type: 'dashboard', id: context.dashboardId }
       default:
@@ -353,10 +360,16 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
     // one of several chips doesn't yank a slideover the others still point at.
     const stillReferenced = remaining.some((other) => {
       const otherResolved = resolveResourceFromContext(other)
-      return otherResolved?.type === resolved.type && otherResolved.id === resolved.id
+      return (
+        otherResolved?.type === resolved.type &&
+        otherResolved.id === resolved.id &&
+        otherResolved.owner?.entityType === resolved.owner?.entityType &&
+        otherResolved.owner?.entityId === resolved.owner?.entityId &&
+        otherResolved.workspaceId === resolved.workspaceId
+      )
     })
     if (stillReferenced) return
-    removeResource(resolved.type, resolved.id)
+    removeResource(resolved.type, resolved.id, resolved.workspaceId, resolved.owner)
   }
 
   function openWorkspaceResource(resource: MothershipResource) {
@@ -371,6 +384,27 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
    * viewed or removed.
    */
   async function handleWorkspaceResourceSelect(ref: WorkspaceResourceRef) {
+    if (ref.type === 'file' && ref.owner?.entityType === 'project') {
+      if (!projectsEnabled || !projectFilesEnabled) return
+      if (!ref.id) {
+        toast.error('This Project file reference is missing its ID')
+        return
+      }
+      const result = await queryClient
+        .fetchQuery({ ...getProjectFileQueryOptions(ref.owner.entityId, ref.id), staleTime: 0 })
+        .catch(() => null)
+      if (!result) {
+        toast.error(`Couldn't open "${ref.title}" in this Project`)
+        return
+      }
+      openWorkspaceResource({
+        type: 'file',
+        id: result.file.id,
+        title: result.file.name,
+        owner: result.file.owner,
+      })
+      return
+    }
     const immediate = resolveWorkspaceResourceRef(ref, workspaceFiles)
     if (immediate) {
       openWorkspaceResource(immediate)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/preview/use-file-preview-controller.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/preview/use-file-preview-controller.ts
index 0269dbdfa84..c7323ba9c25 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/preview/use-file-preview-controller.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/preview/use-file-preview-controller.ts
@@ -26,7 +26,7 @@ import {
 } from '@/app/workspace/[workspaceId]/home/hooks/preview/use-file-preview-sessions'
 import { resolveFileResourceSelectionId } from '@/app/workspace/[workspaceId]/home/resource-view-policy'
 import type { MothershipResource } from '@/app/workspace/[workspaceId]/home/types'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 
 interface FilePreviewControllerDeps {
   workspaceId?: string
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
index f68df297bf1..09ab4a8c690 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/send-handoff.ts
@@ -102,6 +102,8 @@ function isChatContext(value: unknown): value is ChatContext {
       return typeof value.folderId === 'string'
     case 'filefolder':
       return typeof value.fileFolderId === 'string'
+    case 'project':
+      return typeof value.projectId === 'string' && value.workspaceId === undefined
     case 'workspace':
       return typeof value.workspaceId === 'string'
     case 'docs':
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
index 92ad0694990..783bd3abfdf 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.test.ts
@@ -235,3 +235,47 @@ it('refreshes organization policy and its server layout only within the owning o
   expect(deps.queryClient.invalidateQueries).toHaveBeenCalledOnce()
   expect(deps.addResource).not.toHaveBeenCalled()
 })
+
+it.each([undefined, 'ws-1'])(
+  'keeps Project panels independent of the chat workspace %s during live effects and replay',
+  (workspaceId) => {
+    const owner = { entityType: 'project' as const, entityId: 'project-1' }
+    const resource: MothershipResource = {
+      type: 'file',
+      id: 'file-1',
+      title: 'Project file',
+      owner,
+    }
+    const other: MothershipResource = { ...resource, owner: { ...owner, entityId: 'project-2' } }
+    let resources: MothershipResource[] = [other]
+    let active: string | null = null
+    const deps = makeStreamLoopDeps({
+      workspaceId,
+      resourcesRef: { current: resources },
+      setResources: (update) => {
+        resources = typeof update === 'function' ? update(resources) : update
+      },
+      setActiveResourceId: (update) => {
+        active = typeof update === 'function' ? update(active) : update
+      },
+      onResourceEventRef: {
+        current: (id) => {
+          active = id
+        },
+      },
+    })
+    const ctx = { deps } as StreamLoopContext
+    const event: ResourceEvent = {
+      ...removeEvent('file', resource.id),
+      payload: { op: 'upsert', effectId: 'open:1', resource },
+    }
+    handleResourceEvent(ctx, event)
+    expect(resources).toEqual([other, resource])
+    expect(active).toBe('["project","project-1","file","file-1"]')
+    handleResourceEvent(ctx, { ...event, payload: { ...event.payload, replay: true } })
+    expect(resources).toEqual([other, resource])
+    handleResourceEvent(ctx, { ...event, payload: { op: 'remove', effectId: 'close:1', resource } })
+    expect(resources).toEqual([other])
+    expect(active).toBeNull()
+  }
+)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
index 362a342ba20..c1d1fe596dc 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-resource-event.ts
@@ -10,7 +10,10 @@ import { searchResourceMatchesOwner } from '@/lib/mothership/resources/search'
 import {
   getChatResourceKey,
   getChatResourceSelectionId,
+  getChatResourceWorkspaceId,
+  hasValidChatResourceOwner,
   mergeChatResource,
+  normalizeChatResource,
 } from '@/lib/mothership/resources/types'
 import { notifyWorkflowExternalUpdate } from '@/lib/workflows/external-update'
 import { invalidateResourceQueries } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
@@ -26,6 +29,7 @@ import type {
 } from '@/app/workspace/[workspaceId]/home/types'
 import { mothershipChatKeys } from '@/hooks/queries/mothership-chats'
 import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
 import { removeWorkflowFromActiveCache } from '@/hooks/queries/utils/workflow-cache'
 import { useTableViewPinStore } from '@/stores/table/view-pin/store'
 
@@ -74,6 +78,7 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
     if (settings.scope !== 'account' || settings.id === 'profile') ctx.deps.refreshRoute?.()
     return
   }
+  if (!hasValidChatResourceOwner(payload.resource)) return
   if (payload.resource.type === 'search') {
     if (payload.op === 'refresh' || payload.op === 'clear_view') return
     const search = payload.resource.search
@@ -149,7 +154,52 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
     onResourceEvent?.(getChatResourceSelectionId(resource))
     return
   }
-  const workspaceId = payload.resource.workspaceId ?? chatWorkspaceId
+  if ('owner' in payload.resource && payload.resource.owner?.entityType === 'project') {
+    if (
+      (payload.resource.type !== 'file' && payload.resource.type !== 'filefolder') ||
+      payload.resource.workspaceId
+    )
+      return
+    const owner = payload.resource.owner
+    void queryClient.invalidateQueries({ queryKey: projectFilesKeys.project(owner.entityId) })
+    if (payload.op === 'refresh' || payload.resource.type === 'filefolder') return
+    if (payload.effectId || payload.replay || ctx.deps.options.deferFlushes) {
+      const chatId = ctx.deps.chatIdRef.current
+      if (chatId)
+        void queryClient.invalidateQueries({ queryKey: mothershipChatKeys.detail(chatId) })
+      if (payload.replay || ctx.deps.options.deferFlushes) return
+    }
+    const resource: MothershipResource = {
+      ...payload.resource,
+      type: 'file',
+      owner,
+      title: payload.resource.title ?? payload.resource.id,
+    }
+    if (payload.op === 'remove') {
+      if (payload.effectId) {
+        setResources((current) =>
+          current.filter((item) => getChatResourceKey(item) !== getChatResourceKey(resource))
+        )
+        ctx.deps.setActiveResourceId((current) =>
+          current === getChatResourceSelectionId(resource) ? null : current
+        )
+      } else removeResource('file', resource.id, undefined, owner)
+      return
+    }
+    if (payload.effectId)
+      setResources((current) => {
+        const previous = current.find(
+          (item) => getChatResourceKey(item) === getChatResourceKey(resource)
+        )
+        return previous
+          ? current.map((item) => (item === previous ? mergeChatResource(item, resource) : item))
+          : [...current, resource]
+      })
+    else addResource(resource)
+    onResourceEvent?.(getChatResourceSelectionId(resource))
+    return
+  }
+  const workspaceId = getChatResourceWorkspaceId(payload.resource, chatWorkspaceId)
   if (!workspaceId || (chatWorkspaceId && workspaceId !== chatWorkspaceId)) return
   // Browser and terminal tabs are projected from the desktop app's live
   // lists, never from the stream; older servers announced them as resources.
@@ -195,14 +245,14 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
     payload.resource.viewId.trim()
       ? payload.resource.viewId
       : undefined
-  const resource: MothershipResource = {
+  const resource: MothershipResource = normalizeChatResource({
     ...payload.resource,
     ...(chatWorkspaceId ? {} : { workspaceId }),
     type: payload.resource.type as MothershipResourceType,
     title:
       typeof payload.resource.title === 'string' ? payload.resource.title : payload.resource.id,
     ...(pinnedViewId ? { viewId: pinnedViewId } : {}),
-  }
+  })
   const resourceUpdate = resource
 
   if (payload.op === MothershipStreamV1ResourceOp.remove) {
@@ -214,7 +264,9 @@ export function handleResourceEvent(ctx: StreamLoopContext, parsed: ResourceEven
       ctx.deps.setActiveResourceId((current) =>
         current === getChatResourceSelectionId(resource) ? null : current
       )
-    } else if (resource.workspaceId) removeResource(resourceType, resource.id, resource.workspaceId)
+    } else if (resource.owner)
+      removeResource(resourceType, resource.id, resource.workspaceId, resource.owner)
+    else if (resource.workspaceId) removeResource(resourceType, resource.id, resource.workspaceId)
     else removeResource(resourceType, resource.id)
     if (resourceType === 'workflow') {
       removeWorkflowFromActiveCache(queryClient, workspaceId, resource.id)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts
index de83519b5c7..0ebce1d8153 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts
@@ -114,7 +114,8 @@ export interface StreamLoopDeps {
   removeResource: (
     resourceType: MothershipResourceType,
     resourceId: string,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: MothershipResource['owner']
   ) => void
   startClientWorkflowTool: (id: string, name: string, args: Record<string, unknown>) => void
   startClientLocalFilesystemTool: (id: string, name: string, args: Record<string, unknown>) => void
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 e61b0c6c965..744ddf95fd2 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
@@ -363,7 +363,8 @@ function renderUseChatInChat(
     defaultOptions: { queries: { retry: false } },
   }),
   selectedResourceId?: string,
-  requestMode?: 'agent' | 'assistant'
+  requestMode?: 'agent' | 'assistant',
+  strictMode = false
 ): {
   getResult: () => ReturnType<typeof useChat>
   unmount: () => void
@@ -387,11 +388,15 @@ function renderUseChatInChat(
     return null
   }
 
-  act(() => {
-    root.render(
-      <QueryClientProvider client={queryClient}>{(<Probe />) as ReactNode}</QueryClientProvider>
+  const render = () => {
+    const surface = (
+      <QueryClientProvider client={queryClient}>
+        <Probe />
+      </QueryClientProvider>
     )
-  })
+    root.render(strictMode ? <StrictMode>{surface}</StrictMode> : surface)
+  }
+  act(render)
 
   return {
     getResult: () => {
@@ -403,13 +408,7 @@ function renderUseChatInChat(
       chatId = nextChatId
       mockUsePathname.mockReturnValue(`/workspace/ws-1/chat/${chatId}`)
       queryClient.setQueryData(mothershipChatKeys.detail(chatId), nextHistory)
-      act(() =>
-        root.render(
-          <QueryClientProvider client={queryClient}>
-            <Probe />
-          </QueryClientProvider>
-        )
-      )
+      act(render)
     },
   }
 }
@@ -552,24 +551,39 @@ function renderComposerSwap(): {
  * mounts, aborting the in-flight POST, and `consume` has already cleared the
  * entry so the second mount has nothing to replay.
  */
-function renderStrictModeHandoffConsumer(): void {
+function renderStrictModeHandoffConsumer() {
   ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
   queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
   const container = document.createElement('div')
   const root = createRoot(container)
   mountedRoots.push(root)
+  let result: ReturnType<typeof useChat> | undefined
 
   function Probe() {
-    const { sendMessage } = useChat('ws-1', undefined)
+    const chat = useChat('ws-1', undefined)
+    result = chat
+    const { sendMessage, addResource } = chat
     useEffect(() => {
       const handoff = MothershipHandoffStorage.consume('ws-1')
-      if (!handoff?.message) return
+      if (!handoff) return
+      if (!handoff.message) {
+        for (const context of handoff.contexts ?? []) {
+          if (context.kind !== 'file_selection') continue
+          addResource({
+            type: 'file',
+            id: context.fileId,
+            title: context.fileName,
+            owner: context.owner,
+          })
+        }
+        return
+      }
       sendMessage(handoff.message, handoff.fileAttachments, handoff.contexts, {
         ...(handoff.resumeUserMessageId
           ? { resumeUserMessageId: handoff.resumeUserMessageId }
           : {}),
       })
-    }, [sendMessage])
+    }, [sendMessage, addResource])
     return null
   }
 
@@ -580,6 +594,10 @@ function renderStrictModeHandoffConsumer(): void {
       </StrictMode>
     )
   })
+  return () => {
+    if (result === undefined) throw new Error('Hook result is not ready')
+    return result
+  }
 }
 
 /** Every queued message across all chat keys, flattened. */
@@ -624,6 +642,32 @@ describe('useChat remount send recovery', () => {
     resetDeploymentShape()
   })
 
+  it('retains a Project file from a chip-only handoff across StrictMode initialization', () => {
+    const owner = { entityType: 'project', entityId: 'project-1' } as const
+    MothershipHandoffStorage.store(
+      {
+        contexts: [
+          {
+            kind: 'file_selection',
+            fileId: 'file-1',
+            fileName: 'Architecture.md',
+            label: 'Architecture.md (selection)',
+            text: 'Shared architecture context',
+            owner,
+          },
+        ],
+      },
+      'ws-1'
+    )
+
+    const getResult = renderStrictModeHandoffConsumer()
+
+    expect(getResult().resources).toEqual([
+      { type: 'file', id: 'file-1', title: 'Architecture.md', owner },
+    ])
+    expect(MothershipHandoffStorage.consume('ws-1')).toBeNull()
+  })
+
   it.each([false, true])(
     'keeps Search citations in the answer without replacing user panels (existing search: %s)',
     async (hasSearchPanel) => {
@@ -749,6 +793,44 @@ describe('useChat remount send recovery', () => {
     }
   )
 
+  it('reconnects a cached active chat after StrictMode replays its mount effects', async () => {
+    const history: MothershipChatHistory = {
+      id: 'chat-strict-reconnect',
+      title: 'Project architecture',
+      activeStreamId: 'accepted-architecture',
+      messages: [{ id: 'accepted-architecture', role: 'user', content: 'Read the architecture' }],
+      resources: [],
+    }
+    const event: MothershipStreamV1EventEnvelope = {
+      v: 1,
+      seq: 1,
+      ts: new Date().toISOString(),
+      type: 'text',
+      stream: { streamId: 'accepted-architecture', cursor: '1' },
+      payload: { channel: 'assistant', text: 'Recovered architecture response.' },
+    }
+    vi.stubGlobal('fetch', async (input: RequestInfo | URL, init?: RequestInit) => {
+      if (!String(input).includes('/api/mothership/chat/stream')) return fetchStub(input, init)
+      return Response.json({
+        success: true,
+        events: [{ eventId: 1, streamId: 'accepted-architecture', event }],
+        status: 'complete',
+      })
+    })
+    const { getResult } = renderUseChatInChat(
+      history.id,
+      history,
+      undefined,
+      undefined,
+      undefined,
+      true
+    )
+    await act(async () => {})
+    expect(getResult().messages.find((message) => message.role === 'assistant')?.content).toBe(
+      'Recovered architecture response.'
+    )
+  })
+
   it('restores an explicitly selected Search tab while reconnecting an active turn', async () => {
     const shape = resolveDeploymentShape()
     seedDeploymentShape({ ...shape, features: shape.features })
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 8114ddee989..5f2ebffb3e7 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -72,6 +72,7 @@ import { ResourcePersistenceQueue } from '@/lib/mothership/resources/client-pers
 import {
   getChatResourceKey,
   getChatResourceSelectionId,
+  hasValidChatResourceOwner,
   isAddressableResource,
   isEphemeralResource,
   type MothershipResourceUpdate,
@@ -316,7 +317,8 @@ export interface UseChatReturn {
   removeResource: (
     resourceType: MothershipResourceType,
     resourceId: string,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: MothershipResource['owner']
   ) => void
   reorderResources: (resources: MothershipResource[]) => void
   messageQueue: QueuedMessage[]
@@ -862,6 +864,7 @@ export function useChat(
   // migrates this bucket onto the real chatId on first send. Rotated on
   // home reset so a new pending chat starts with an empty bucket.
   const pendingChatKeyRef = useRef<string>(`${PENDING_CHAT_KEY_PREFIX}${generateShortId()}`)
+  const initializedChatScopeRef = useRef<{ scopeKey: string; chatId?: string } | null>(null)
   const pendingDesktopScopeIdRef = useRef(
     desktopChatScopeId(scopeKey, undefined, pendingChatKeyRef.current)
   )
@@ -1411,8 +1414,8 @@ export function useChat(
   const addResource = useCallback(
     (resourceUpdate: MothershipResourceUpdate): boolean => {
       // The single fan-in for tab creation, so the invariant lives here.
-      if (!isAddressableResource(resourceUpdate)) {
-        logger.warn('Ignored a resource with no id', {
+      if (!isAddressableResource(resourceUpdate) || !hasValidChatResourceOwner(resourceUpdate)) {
+        logger.warn('Ignored a resource with an invalid address', {
           type: resourceUpdate.type,
           title: resourceUpdate.title,
         })
@@ -1470,11 +1473,21 @@ export function useChat(
   )
 
   const removeResource = useCallback(
-    (resourceType: MothershipResourceType, resourceId: string, resourceWorkspaceId?: string) => {
-      const matches = (resource: MothershipResource) =>
-        resource.type === resourceType &&
-        resource.id === resourceId &&
-        resource.workspaceId === resourceWorkspaceId
+    (
+      resourceType: MothershipResourceType,
+      resourceId: string,
+      resourceWorkspaceId?: string,
+      resourceOwner?: MothershipResource['owner']
+    ) => {
+      const removed = {
+        type: resourceType,
+        id: resourceId,
+        workspaceId: resourceWorkspaceId,
+        owner: resourceOwner,
+      }
+      if (!hasValidChatResourceOwner(removed)) return
+      const removedKey = getChatResourceKey(removed)
+      const matches = (resource: MothershipResource) => getChatResourceKey(resource) === removedKey
       if (resourceType === 'table') tableViewContextsRef.current.views.delete(resourceId)
       setResources((prev) => prev.filter((r) => !matches(r)))
       setActiveResourceId((prev) =>
@@ -1483,6 +1496,7 @@ export function useChat(
           type: resourceType,
           id: resourceId,
           workspaceId: resourceWorkspaceId,
+          owner: resourceOwner,
           title: '',
         })
           ? null
@@ -1512,7 +1526,8 @@ export function useChat(
         resourceId,
         persistenceScopeId,
         Boolean(existing && persistChatId),
-        resourceWorkspaceId
+        resourceWorkspaceId,
+        resourceOwner
       )
       if (wasPending && !inFlightAdd && !wasPersisted) return
 
@@ -1524,6 +1539,7 @@ export function useChat(
             resourceType,
             resourceId,
             workspaceId: resourceWorkspaceId,
+            owner: resourceOwner,
           },
         })
         await refreshResourceHistory(persistChatId)
@@ -1829,6 +1845,10 @@ export function useChat(
   )
 
   useEffect(() => {
+    const initializedScope = initializedChatScopeRef.current
+    if (initializedScope?.scopeKey === scopeKey && initializedScope.chatId === initialChatId) return
+    // Replayed mount effects must retain resources from an already-consumed handoff.
+    initializedChatScopeRef.current = { scopeKey, chatId: initialChatId }
     const previousDesktopScopeId = desktopScopeIdRef.current
     const canDiscardPreviousPendingScope = !sendingRef.current
     const streamOwnerId = chatIdRef.current
@@ -2068,13 +2088,15 @@ export function useChat(
 
     void recoverPendingClientWorkflowTools(mappedMessages)
 
-    const hasPersistedStreamingFile = chatHistory.resources.some((r) => r.id === 'streaming-file')
-    if (hasPersistedStreamingFile) {
+    const streamingResources = chatHistory.resources.filter((r) => r.id === 'streaming-file')
+    for (const resource of streamingResources) {
       requestJson(removeMothershipChatResourceContract, {
         body: {
           chatId: chatHistory.id,
-          resourceType: 'file',
-          resourceId: 'streaming-file',
+          resourceType: resource.type,
+          resourceId: resource.id,
+          owner: resource.owner,
+          workspaceId: resource.workspaceId,
         },
       }).catch(() => {})
     }
@@ -2144,7 +2166,13 @@ export function useChat(
         r.id !== 'streaming-file' &&
         !serverKeys.has(getChatResourceKey(r)) &&
         (isEphemeralResource(r) ||
-          resourcePersistenceQueue.hasPendingUpsert(chatHistory.id, r.type, r.id, r.workspaceId))
+          resourcePersistenceQueue.hasPendingUpsert(
+            chatHistory.id,
+            r.type,
+            r.id,
+            r.workspaceId,
+            r.owner
+          ))
     )
     // Server order is authoritative for persisted resources, but local-only
     // items (pending-persist adds and synthetic ephemeral panels)
@@ -2204,7 +2232,7 @@ export function useChat(
       if (workflowResources.length > 0) {
         void reconcileHydratedWorkflowResources(chatHistory.id, workflowResources)
       }
-    } else if (resourcesRef.current.length > 0 || hasPersistedStreamingFile) {
+    } else if (resourcesRef.current.length > 0 || streamingResources.length > 0) {
       activeResourceIdRef.current = null
       setResources([])
       setActiveResourceId(null)
@@ -5380,6 +5408,7 @@ export function useChat(
       }
       detachedChatResolutionControllers.clear()
       clearActiveTurn()
+      appliedChatHistoryKeyRef.current = undefined
       sendingRef.current = false
       // Release the editing slot — the composer it binds to is unmounting.
       useMothershipQueueStore.getState().setEditing(chatKeyRef.current, null)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/types.ts b/apps/sim/app/workspace/[workspaceId]/home/types.ts
index 8f7c102a7e9..a05736f7ff0 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/types.ts
@@ -154,6 +154,7 @@ export interface ChatMessageAttachment {
 
 export interface ChatMessageContext {
   kind: ChatContextKind
+  projectId?: string
   label: string
   workflowId?: string
   knowledgeId?: string
diff --git a/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.test.tsx b/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.test.tsx
index 8e305160892..7e75a2ebae9 100644
--- a/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.test.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.test.tsx
@@ -66,7 +66,20 @@ describe('useWorkspaceInvalidationRoom', () => {
     }
   })
 
-  /*
+  it('refreshes once per shared cache group and retains a surviving subscriber', () => {
+    const refresh = vi.fn()
+    const first = mount('ws-1', 'workspace-files', refresh, 'shared-cache')
+    mount('ws-1', 'workspace-files', refresh, 'shared-cache')
+    const changed = socket.on.mock.calls.find(([event]) => event === 'workspace-files-changed')?.[1]
+    if (!changed) throw new Error('Missing workspace change subscription')
+    act(() => changed({ workspaceId: 'ws-1' }))
+    expect(refresh).toHaveBeenCalledTimes(1)
+    unmount(first)
+    act(() => changed({ workspaceId: 'ws-1' }))
+    expect(refresh).toHaveBeenCalledTimes(2)
+  })
+
+  /**
    * An editor can show several folder pickers, each subscribing to the same
    * room. Without reference counting the first to unmount emitted `leave` and
    * evicted the socket, so its still-mounted siblings silently stopped
diff --git a/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.ts b/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.ts
index ce0c56da60d..0e07d58745c 100644
--- a/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.ts
+++ b/apps/sim/app/workspace/[workspaceId]/hooks/use-workspace-invalidation-room.ts
@@ -1,137 +1,14 @@
 'use client'
 
-import { useEffect, useRef } from 'react'
-import { createLogger } from '@sim/logger'
 import type { RoomType } from '@sim/realtime-protocol/rooms'
-import type { Socket } from 'socket.io-client'
-import { useSocket } from '@/app/workspace/providers/socket-provider'
+import { useInvalidationRoom } from '@/hooks/use-invalidation-room'
 
-const logger = createLogger('WorkspaceInvalidationRoom')
-
-/** Retry cap + base delay for a retryable join failure on an otherwise-live socket. */
-const MAX_JOIN_RETRIES = 3
-const JOIN_RETRY_BASE_MS = 1000
-
-interface JoinErrorPayload {
-  workspaceId: string
-  error: string
-  code: string
-  retryable?: boolean
-}
-
-interface SharedRoomSubscription {
-  callbacks: Map<string | symbol, Set<() => void>>
-  dispose: () => void
-}
-
-const subscriptionsBySocket = new WeakMap<Socket, Map<string, SharedRoomSubscription>>()
-
-function createSharedRoomSubscription(
-  socket: Socket,
-  workspaceId: string,
-  roomType: RoomType
-): SharedRoomSubscription {
-  const joinEvent = `join-${roomType}`
-  const successEvent = `${joinEvent}-success`
-  const errorEvent = `${joinEvent}-error`
-  const leaveEvent = `leave-${roomType}`
-  const changedEvent = `${roomType}-changed`
-  const callbacks = new Map<string | symbol, Set<() => void>>()
-  let retries = 0
-  let retryTimer: ReturnType<typeof setTimeout> | null = null
-
-  const join = () => socket.emit(joinEvent, { workspaceId })
-  const handleConnect = () => {
-    retries = 0
-    if (retryTimer) clearTimeout(retryTimer)
-    retryTimer = null
-    join()
-  }
-  const handleJoinSuccess = (data: { workspaceId: string }) => {
-    if (data.workspaceId !== workspaceId) return
-    retries = 0
-    if (retryTimer) clearTimeout(retryTimer)
-    retryTimer = null
-  }
-  const handleJoinError = (data: JoinErrorPayload) => {
-    if (data.workspaceId !== workspaceId) return
-    logger.warn(`Failed to join ${roomType} room`, { code: data.code, error: data.error })
-    if (!data.retryable || retries >= MAX_JOIN_RETRIES) return
-    retries += 1
-    if (retryTimer) clearTimeout(retryTimer)
-    retryTimer = setTimeout(join, JOIN_RETRY_BASE_MS * retries)
-  }
-  const handleChanged = (data: { workspaceId: string }) => {
-    if (data.workspaceId !== workspaceId) return
-    for (const group of callbacks.values()) group.values().next().value?.()
-  }
-
-  if (socket.connected) join()
-  socket.on('connect', handleConnect)
-  socket.on(successEvent, handleJoinSuccess)
-  socket.on(errorEvent, handleJoinError)
-  socket.on(changedEvent, handleChanged)
-
-  return {
-    callbacks,
-    dispose: () => {
-      if (retryTimer) clearTimeout(retryTimer)
-      socket.off('connect', handleConnect)
-      socket.off(successEvent, handleJoinSuccess)
-      socket.off(errorEvent, handleJoinError)
-      socket.off(changedEvent, handleChanged)
-      socket.emit(leaveEvent, { workspaceId })
-    },
-  }
-}
-
-/**
- * Joins a workspace-scoped, presence-free "invalidation room" over the shared socket and runs
- * `onChanged` whenever the server broadcasts `${roomType}-changed` for this workspace, so the list
- * refetches without waiting for staleness. Shared core behind {@link useWorkspaceFilesRoom} and
- * {@link useWorkspaceTablesRoom}; event names derive from `roomType`.
- *
- * These rooms carry no presence — "who's in a resource" comes from the per-resource room, not from
- * who's browsing the section. Mutations happen server-side (HTTP + copilot) and fan out this signal.
- */
+/** Workspace list consumers retain their existing event names, payloads, and query callbacks. */
 export function useWorkspaceInvalidationRoom(
   workspaceId: string,
   roomType: RoomType,
   onChanged: () => void,
   dedupeKey?: string
 ): void {
-  const { socket } = useSocket()
-  const onChangedRef = useRef(onChanged)
-  onChangedRef.current = onChanged
-  const privateCallbackKeyRef = useRef(Symbol('workspace-invalidation-callback'))
-
-  useEffect(() => {
-    if (!socket || !workspaceId) return
-    const subscriberKey = `${workspaceId}|${roomType}`
-    let socketSubscriptions = subscriptionsBySocket.get(socket)
-    if (!socketSubscriptions) {
-      socketSubscriptions = new Map()
-      subscriptionsBySocket.set(socket, socketSubscriptions)
-    }
-    let subscription = socketSubscriptions.get(subscriberKey)
-    if (!subscription) {
-      subscription = createSharedRoomSubscription(socket, workspaceId, roomType)
-      socketSubscriptions.set(subscriberKey, subscription)
-    }
-
-    const callbackKey = dedupeKey ?? privateCallbackKeyRef.current
-    const callback = () => onChangedRef.current()
-    const callbackGroup = subscription.callbacks.get(callbackKey) ?? new Set()
-    callbackGroup.add(callback)
-    subscription.callbacks.set(callbackKey, callbackGroup)
-
-    return () => {
-      callbackGroup.delete(callback)
-      if (callbackGroup.size === 0) subscription.callbacks.delete(callbackKey)
-      if (subscription.callbacks.size > 0) return
-      subscription.dispose()
-      socketSubscriptions.delete(subscriberKey)
-      if (socketSubscriptions.size === 0) subscriptionsBySocket.delete(socket)
-    }
-  }, [dedupeKey, socket, workspaceId, roomType])
+  useInvalidationRoom({ ownerId: workspaceId, roomType, onChanged, dedupeKey })
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/layout.tsx b/apps/sim/app/workspace/[workspaceId]/layout.tsx
index 6d324e690ee..4bc7916daf8 100644
--- a/apps/sim/app/workspace/[workspaceId]/layout.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/layout.tsx
@@ -4,6 +4,7 @@ import { redirect } from 'next/navigation'
 import { SettingsNavigationProvider } from '@/components/settings/settings-navigation-provider'
 import { getSession } from '@/lib/auth'
 import { getActiveOrganizationId } from '@/lib/auth/session-response'
+import { isFeatureEnabled } from '@/lib/core/config/feature-flags'
 import { isDashboardsEnabled } from '@/lib/dashboards/feature-flag'
 import {
   hasDesktopBackgroundExecutor,
@@ -11,6 +12,7 @@ import {
 } from '@/lib/desktop/executor/availability'
 import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { resolveOrganizationEntryPath } from '@/lib/navigation/resolve-app-entry'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { ImpersonationBanner } from '@/app/workspace/[workspaceId]/components/impersonation-banner'
 import { SessionExpired } from '@/app/workspace/[workspaceId]/components/session-expired'
@@ -69,6 +71,8 @@ export default async function WorkspaceLayout({
     planModeEnabled,
     organizationHref,
     dashboardsEnabled,
+    projectsEnabled,
+    projectFilesEnabled,
     desktopExecutorRegistered,
   ] = await Promise.all([
     cookies(),
@@ -86,6 +90,8 @@ export default async function WorkspaceLayout({
     isPlanModeEnabled(),
     resolveOrganizationEntryPath(session),
     isDashboardsEnabled(hostContext.hostOrganizationId),
+    isFeatureEnabled('projects'),
+    isProjectFileApiEnabled(),
     hasDesktopBackgroundExecutor(session.user.id),
     prefetchWorkspaceAccess(queryClient, workspaceId, principal),
     prefetchWorkspaceForkAvailability(queryClient, workspaceId, principal, hostContext),
@@ -96,6 +102,8 @@ export default async function WorkspaceLayout({
     <HydrationBoundary state={dehydrate(queryClient)}>
       <FeatureFlagsProvider
         flags={{
+          projects: projectsEnabled,
+          'project-files': projectFilesEnabled,
           dashboards: dashboardsEnabled,
           'mothership-model-selector': modelSelectorEnabled,
           'mothership-plan-mode': planModeEnabled,
diff --git a/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.test.ts b/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.test.ts
index 6e95a4de659..5dbbec55d39 100644
--- a/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.test.ts
+++ b/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.test.ts
@@ -1,5 +1,5 @@
-import { emcnMock } from '@sim/testing/mocks/emcn.mock'
 import { describe, expect, it, vi } from 'vitest'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 
 const { mockListWorkspaceFilesWithShares } = vi.hoisted(() => ({
   mockListWorkspaceFilesWithShares: vi.fn(),
@@ -9,11 +9,7 @@ vi.mock('@/lib/workspace-files/queries', () => ({
   listWorkspaceFilesWithShares: mockListWorkspaceFilesWithShares,
 }))
 
-/** The key factory lives in a `'use client'` module that pulls emcn's CSS at import. */
-vi.mock('@sim/emcn', () => emcnMock)
-
 import { seedWorkspaceFiles } from '@/app/workspace/[workspaceId]/lib/seed-workspace-files'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
 
 const WORKSPACE_ID = 'ws-123'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.ts b/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.ts
index d2a476f3a78..ad579ca35de 100644
--- a/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.ts
+++ b/apps/sim/app/workspace/[workspaceId]/lib/seed-workspace-files.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import type { QueryClient } from '@tanstack/react-query'
 import { listWorkspaceFilesWithShares } from '@/lib/workspace-files/queries'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 
 const logger = createLogger('SeedWorkspaceFiles')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/feature-flags-provider.tsx b/apps/sim/app/workspace/[workspaceId]/providers/feature-flags-provider.tsx
index 17b542ff168..433dffd7a2a 100644
--- a/apps/sim/app/workspace/[workspaceId]/providers/feature-flags-provider.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/providers/feature-flags-provider.tsx
@@ -3,6 +3,8 @@
 import { createContext, type ReactNode, useContext } from 'react'
 
 export interface WorkspaceFeatureFlags {
+  projects: boolean
+  'project-files': boolean
   dashboards: boolean
   'mothership-model-selector': boolean
   'mothership-plan-mode': boolean
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
index 4c1d0c82d16..d9b8a89a827 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
@@ -191,6 +191,8 @@ export function areContextsEqual(c: ChatContext, context: ChatContext): boolean
       return context.kind === 'folder' && c.folderId === context.folderId
     case 'filefolder':
       return context.kind === 'filefolder' && c.fileFolderId === context.fileFolderId
+    case 'project':
+      return context.kind === 'project' && c.projectId === context.projectId
     case 'workspace':
       return true // The owner comparison above is the whole identity.
     // Selection kinds scope to part of a resource, so equality is the selected
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 44065aa2c4f..a92bf43e109 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
@@ -26,11 +26,11 @@ import { useActiveCanonicalSubBlockValue } from '@/app/workspace/[workspaceId]/w
 import { useResourceFolders } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-resource-folders'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useActiveSearchTarget } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/providers/active-search-target-provider'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 import {
   useCloudStorageConfigured,
   useUploadWorkspaceFile,
   useWorkspaceFiles,
-  workspaceFilesKeys,
 } from '@/hooks/queries/workspace-files'
 import { getProviderAttachmentMaxBytes } from '@/providers/attachments'
 import { getProviderFromModel } from '@/providers/utils'
diff --git a/apps/sim/components/settings/use-settings-browser-navigation.test.tsx b/apps/sim/components/settings/use-settings-browser-navigation.test.tsx
index a917401ae05..71d11575bcf 100644
--- a/apps/sim/components/settings/use-settings-browser-navigation.test.tsx
+++ b/apps/sim/components/settings/use-settings-browser-navigation.test.tsx
@@ -1,6 +1,6 @@
 /** @vitest-environment jsdom */
 
-import { act, useState } from 'react'
+import { act, useEffect, useState } from 'react'
 import { nextNavigationMockFns } from '@sim/testing/mocks/next-navigation.mock'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -8,6 +8,10 @@ import { SettingsIntentLink } from '@/components/settings/settings-intent-link'
 import { SettingsNavigationGuard } from '@/components/settings/settings-navigation-guard'
 import { useSettingsBrowserNavigation } from '@/components/settings/use-settings-browser-navigation'
 import { useSettingsUnsavedGuard } from '@/components/settings/use-settings-unsaved-guard'
+import {
+  FileNavigationProvider,
+  useFileNavigation,
+} from '@/app/workspace/[workspaceId]/files/components/file-detail/navigation'
 import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
 vi.mock(
@@ -587,3 +591,63 @@ describe('native settings navigation', () => {
     expect(unload.defaultPrevented).toBe(false)
   })
 })
+
+function FileDraft() {
+  const [draft, setDraft] = useState('')
+  const { setIsDirty, discardRef } = useFileNavigation({
+    owner: { entityType: 'project', entityId: 'project' },
+  })
+  useEffect(() => {
+    discardRef.current = () => setDraft('')
+    return () => {
+      discardRef.current = null
+    }
+  }, [discardRef])
+  return (
+    <input
+      value={draft}
+      onChange={(event) => {
+        setDraft(event.target.value)
+        setIsDirty(Boolean(event.target.value))
+      }}
+    />
+  )
+}
+
+it.each([-1, 1])(
+  'keeps a file draft through native history cancellation and discards only on confirmed traversal %s',
+  async (delta) => {
+    window.history.pushState({ router: 'future' }, '', '/future')
+    nativeGo.call(window.history, -1)
+    await settle()
+    act(() =>
+      root.render(
+        <FileNavigationProvider
+          owner={{ entityType: 'project', entityId: 'project' }}
+          fileId='file'
+        >
+          <FileDraft />
+        </FileNavigationProvider>
+      )
+    )
+    const field = container.querySelector('input')
+    const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set
+    if (!field || !setter) throw new Error('Missing file draft')
+    act(() => {
+      setter.call(field, 'unsaved file draft')
+      field.dispatchEvent(new Event('input', { bubbles: true }))
+    })
+    nativeGo.call(window.history, delta)
+    await settle()
+    expect(window.location.pathname).toBe('/editor')
+    expect(field.value).toBe('unsaved file draft')
+    act(() => useSettingsDirtyStore.getState().cancelLeave())
+    expect(field.value).toBe('unsaved file draft')
+    nativeGo.call(window.history, delta)
+    await settle()
+    act(() => useSettingsDirtyStore.getState().confirmLeave())
+    await settle()
+    expect(window.location.pathname).toBe(delta === -1 ? '/prior' : '/future')
+    expect(field.value).toBe('')
+  }
+)
diff --git a/apps/sim/hooks/queries/file-copy.ts b/apps/sim/hooks/queries/file-copy.ts
new file mode 100644
index 00000000000..3fc1d4ec9c9
--- /dev/null
+++ b/apps/sim/hooks/queries/file-copy.ts
@@ -0,0 +1,37 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { requestJson } from '@/lib/api/client/request'
+import { type CopyFileItemsBody, copyFileItemsContract } from '@/lib/api/contracts/file-copy'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { getFileBrowserOwnerAdapter } from '@/hooks/queries/utils/file-browser-owner-adapters'
+
+const FILE_DESTINATION_STALE_TIME = 30_000
+export const fileCopyKeys = {
+  all: ['fileCopy'] as const,
+  destinations: () => [...fileCopyKeys.all, 'destination'] as const,
+  destination: (owner: EditableFileOwner) =>
+    [...fileCopyKeys.destinations(), owner.entityType, owner.entityId] as const,
+}
+
+export function useFileCopyDestination(owner: EditableFileOwner) {
+  return useQuery({
+    queryKey: fileCopyKeys.destination(owner),
+    queryFn: ({ signal }) =>
+      getFileBrowserOwnerAdapter(owner).destinationFolders(owner.entityId, signal),
+    staleTime: FILE_DESTINATION_STALE_TIME,
+    refetchOnMount: 'always',
+  })
+}
+
+export function useCopyFileItems() {
+  const client = useQueryClient()
+  return useMutation({
+    mutationFn: (body: CopyFileItemsBody) =>
+      requestJson(copyFileItemsContract, { body, query: {} }),
+    onSuccess: async (_result, { destination }) => {
+      await getFileBrowserOwnerAdapter(destination.owner).invalidate(
+        client,
+        destination.owner.entityId
+      )
+    },
+  })
+}
diff --git a/apps/sim/hooks/queries/file-extraction.ts b/apps/sim/hooks/queries/file-extraction.ts
new file mode 100644
index 00000000000..6c792bfbd73
--- /dev/null
+++ b/apps/sim/hooks/queries/file-extraction.ts
@@ -0,0 +1,25 @@
+import { toast } from '@sim/emcn'
+import { getErrorMessage } from '@sim/utils/errors'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { fileCopyKeys } from '@/hooks/queries/file-copy'
+import { getFileBrowserOwnerAdapter } from '@/hooks/queries/utils/file-browser-owner-adapters'
+
+export function useExtractFile(owner: EditableFileOwner) {
+  const client = useQueryClient()
+  return useMutation({
+    mutationFn: ({ fileId }: { fileId: string; fileName: string }) =>
+      getFileBrowserOwnerAdapter(owner).extract(owner.entityId, fileId),
+    onSuccess: (data, { fileName }) => {
+      toast.success(`Unzipped "${fileName}" into "${data.folderName}"`)
+    },
+    onError: (error) => {
+      toast.error(getErrorMessage(error, 'Unable to unzip this archive'))
+    },
+    onSettled: () =>
+      Promise.all([
+        getFileBrowserOwnerAdapter(owner).invalidate(client, owner.entityId),
+        client.invalidateQueries({ queryKey: fileCopyKeys.destination(owner) }),
+      ]),
+  })
+}
diff --git a/apps/sim/hooks/queries/file-history.ts b/apps/sim/hooks/queries/file-history.ts
new file mode 100644
index 00000000000..83a086d4869
--- /dev/null
+++ b/apps/sim/hooks/queries/file-history.ts
@@ -0,0 +1,48 @@
+import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
+import type { RevertWorkspaceFileVersionBody } from '@/lib/api/contracts/workspace-file-versions'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { getFileBrowserOwnerAdapter } from '@/hooks/queries/utils/file-browser-owner-adapters'
+
+const FILE_HISTORY_STALE_TIME = 30_000
+export const fileHistoryKeys = {
+  all: ['fileHistory'] as const,
+  lists: () => [...fileHistoryKeys.all, 'list'] as const,
+  owner: (owner: EditableFileOwner) =>
+    [...fileHistoryKeys.lists(), owner.entityType, owner.entityId] as const,
+  list: (owner: EditableFileOwner, fileId: string) =>
+    [...fileHistoryKeys.owner(owner), fileId] as const,
+}
+
+export function useFileHistory(owner: EditableFileOwner, fileId: string, enabled: boolean) {
+  return useInfiniteQuery({
+    queryKey: fileHistoryKeys.list(owner, fileId),
+    initialPageParam: undefined as string | undefined,
+    queryFn: ({ signal, pageParam }) =>
+      getFileBrowserOwnerAdapter(owner).history(owner.entityId, fileId, pageParam, signal),
+    getNextPageParam: (page) => page.nextCursor ?? undefined,
+    staleTime: FILE_HISTORY_STALE_TIME,
+    enabled: Boolean(fileId) && enabled,
+    refetchOnMount: 'always',
+  })
+}
+
+export function useRevertFileVersion(owner: EditableFileOwner, fileId: string) {
+  const client = useQueryClient()
+  return useMutation({
+    mutationFn: ({ version, ...body }: RevertWorkspaceFileVersionBody & { version: number }) =>
+      getFileBrowserOwnerAdapter(owner).revert(owner.entityId, fileId, version, body),
+    onSuccess: async () => {
+      await Promise.all([
+        client.invalidateQueries({ queryKey: fileHistoryKeys.list(owner, fileId) }),
+        getFileBrowserOwnerAdapter(owner).invalidate(client, owner.entityId, fileId),
+      ])
+    },
+  })
+}
+
+export function useDownloadFileVersion(owner: EditableFileOwner, fileId: string) {
+  return useMutation({
+    mutationFn: (version: number) =>
+      getFileBrowserOwnerAdapter(owner).downloadVersion(owner.entityId, fileId, version),
+  })
+}
diff --git a/apps/sim/hooks/queries/project-files.ts b/apps/sim/hooks/queries/project-files.ts
new file mode 100644
index 00000000000..4d5f6a61ac9
--- /dev/null
+++ b/apps/sim/hooks/queries/project-files.ts
@@ -0,0 +1,273 @@
+import {
+  type QueryClient,
+  queryOptions,
+  useInfiniteQuery,
+  useMutation,
+  useQueries,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query'
+import { requestJson } from '@/lib/api/client/request'
+import {
+  type CreateProjectFileFolderBody,
+  createProjectFileFolderContract,
+  type ListProjectFileFoldersQuery,
+  listProjectFileFoldersContract,
+  type UpdateProjectFileFolderBody,
+  updateProjectFileFolderContract,
+} from '@/lib/api/contracts/project-file-folders'
+import {
+  type ArchiveProjectFileItemsBody,
+  archiveProjectFileItemsContract,
+  type MoveProjectFileItemsBody,
+  moveProjectFileItemsContract,
+  type RenameProjectFileBody,
+  renameProjectFileContract,
+  restoreProjectFileContract,
+  restoreProjectFileFolderContract,
+} from '@/lib/api/contracts/project-file-lifecycle'
+import {
+  type CreateProjectFileBody,
+  createProjectFileContract,
+  getProjectFileContract,
+  type ListProjectFilesQuery,
+  type ListProjectFilesResponse,
+  listProjectFilesContract,
+} from '@/lib/api/contracts/project-files'
+import { getWorkspaceProjectContract } from '@/lib/api/contracts/projects'
+import { uploadProjectFileSession } from '@/lib/uploads/client/session-upload'
+import type { UploadProgressEvent } from '@/lib/uploads/client/types'
+import { PROJECT_FILE_STALE_TIME, projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+
+export function useWorkspaceProject(workspaceId?: string, enabled = true) {
+  return useQuery({
+    queryKey: projectFilesKeys.workspaceProject(workspaceId),
+    queryFn: ({ signal }) => {
+      if (!workspaceId) throw new Error('Workspace is required')
+      return requestJson(getWorkspaceProjectContract, { params: { workspaceId }, signal })
+    },
+    enabled: Boolean(workspaceId) && enabled,
+    staleTime: PROJECT_FILE_STALE_TIME,
+  })
+}
+
+export function useProjectFiles(
+  projectId: string | undefined,
+  filters: Omit<ListProjectFilesQuery, 'cursor'>,
+  enabled = true
+) {
+  return useInfiniteQuery({
+    queryKey: projectFilesKeys.list(projectId, filters),
+    initialPageParam: null as string | null,
+    queryFn: ({ signal, pageParam }) => {
+      if (!projectId) throw new Error('Project is required')
+      return requestJson(listProjectFilesContract, {
+        params: { id: projectId },
+        query: { ...filters, cursor: pageParam ?? undefined },
+        signal,
+      })
+    },
+    getNextPageParam: (page) => page.nextCursor,
+    enabled: Boolean(projectId) && enabled,
+    staleTime: PROJECT_FILE_STALE_TIME,
+  })
+}
+
+/** Loads the complete active hierarchy for resource pickers, including nested files. */
+function getProjectFileInventoryQueryOptions(projectId: string | undefined, enabled = true) {
+  return queryOptions({
+    queryKey: projectFilesKeys.inventory(projectId),
+    queryFn: async ({ signal }) => {
+      if (!projectId) throw new Error('Project is required')
+      const items: ListProjectFilesResponse['items'] = []
+      let cursor: string | undefined
+      do {
+        const page = await requestJson(listProjectFilesContract, {
+          params: { id: projectId },
+          query: {
+            scope: 'active',
+            recursive: true,
+            limit: 100,
+            sortBy: 'name',
+            sortOrder: 'asc',
+            cursor,
+          },
+          signal,
+        })
+        items.push(...page.items)
+        cursor = page.nextCursor ?? undefined
+      } while (cursor)
+      return items
+    },
+    enabled: Boolean(projectId) && enabled,
+    staleTime: PROJECT_FILE_STALE_TIME,
+    retry: false,
+  })
+}
+
+export function useProjectFileInventory(projectId: string | undefined, enabled = true) {
+  return useQuery(getProjectFileInventoryQueryOptions(projectId, enabled))
+}
+
+export function useProjectFileInventories(projectIds: readonly string[], enabled = true) {
+  return useQueries({
+    queries: projectIds.map((projectId) => getProjectFileInventoryQueryOptions(projectId, enabled)),
+  })
+}
+
+export function getProjectFileQueryOptions(projectId?: string, fileId?: string) {
+  return queryOptions({
+    queryKey: projectFilesKeys.record(projectId, fileId),
+    queryFn: ({ signal }) => {
+      if (!projectId || !fileId) throw new Error('Project and file are required')
+      return requestJson(getProjectFileContract, {
+        params: { id: projectId, fileId },
+        signal,
+      })
+    },
+    enabled: Boolean(projectId && fileId),
+    staleTime: PROJECT_FILE_STALE_TIME,
+  })
+}
+
+export function useProjectFile(projectId?: string, fileId?: string) {
+  return useQuery(getProjectFileQueryOptions(projectId, fileId))
+}
+
+export function useProjectFileFolders(
+  projectId: string | undefined,
+  scope: ListProjectFileFoldersQuery['scope'] = 'active'
+) {
+  return useQuery({
+    queryKey: projectFilesKeys.folders(projectId, scope),
+    queryFn: ({ signal }) => {
+      if (!projectId) throw new Error('Project is required')
+      return requestJson(listProjectFileFoldersContract, {
+        params: { id: projectId },
+        query: { scope },
+        signal,
+      })
+    },
+    enabled: Boolean(projectId),
+    staleTime: PROJECT_FILE_STALE_TIME,
+  })
+}
+
+export function useCreateProjectFile(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: (body: CreateProjectFileBody) =>
+      requestJson(createProjectFileContract, { params: { id: projectId }, body }),
+    onSuccess: (result) => {
+      queryClient.setQueryData(projectFilesKeys.record(projectId, result.file.id), result)
+      return queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectLists(projectId) })
+    },
+  })
+}
+
+interface UploadProjectFileParams {
+  projectId: string
+  file: File
+  folderId?: string | null
+  signal?: AbortSignal
+  onProgress?: (event: UploadProgressEvent) => void
+}
+
+export function useUploadProjectFile() {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: async (params: UploadProjectFileParams) => ({
+      success: true as const,
+      file: await uploadProjectFileSession(params),
+    }),
+    onSuccess: (_result, variables) =>
+      queryClient.invalidateQueries({
+        queryKey: projectFilesKeys.projectLists(variables.projectId),
+      }),
+  })
+}
+
+export function useCreateProjectFileFolder(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: (body: CreateProjectFileFolderBody) =>
+      requestJson(createProjectFileFolderContract, { params: { id: projectId }, body }),
+    onSuccess: () =>
+      Promise.all([
+        queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectFolders(projectId) }),
+        queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectLists(projectId) }),
+      ]),
+  })
+}
+
+export function useUpdateProjectFileFolder(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: ({ folderId, body }: { folderId: string; body: UpdateProjectFileFolderBody }) =>
+      requestJson(updateProjectFileFolderContract, {
+        params: { id: projectId, folderId },
+        body,
+      }),
+    onSuccess: () =>
+      Promise.all([
+        queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectFolders(projectId) }),
+        queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectLists(projectId) }),
+        queryClient.invalidateQueries({ queryKey: projectFilesKeys.records(projectId) }),
+      ]),
+  })
+}
+
+export function useRenameProjectFile(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: ({ fileId, name }: RenameProjectFileBody & { fileId: string }) =>
+      requestJson(renameProjectFileContract, {
+        params: { id: projectId, fileId },
+        body: { name },
+      }),
+    onSuccess: () => invalidateProjectFileItems(queryClient, projectId),
+  })
+}
+
+export function useMoveProjectFileItems(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: (body: MoveProjectFileItemsBody) =>
+      requestJson(moveProjectFileItemsContract, { params: { id: projectId }, body }),
+    onSuccess: () => invalidateProjectFileItems(queryClient, projectId),
+  })
+}
+
+export function useArchiveProjectFileItems(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: (body: ArchiveProjectFileItemsBody) =>
+      requestJson(archiveProjectFileItemsContract, { params: { id: projectId }, body }),
+    onSuccess: () => invalidateProjectFileItems(queryClient, projectId),
+  })
+}
+
+export function useRestoreProjectFileItems(projectId: string) {
+  const queryClient = useQueryClient()
+  return useMutation({
+    mutationFn: async (target: { kind: 'file' | 'folder'; id: string }) =>
+      target.kind === 'file'
+        ? requestJson(restoreProjectFileContract, {
+            params: { id: projectId, fileId: target.id },
+            body: {},
+          })
+        : requestJson(restoreProjectFileFolderContract, {
+            params: { id: projectId, folderId: target.id },
+            body: {},
+          }),
+    onSuccess: () => invalidateProjectFileItems(queryClient, projectId),
+  })
+}
+
+function invalidateProjectFileItems(queryClient: QueryClient, projectId: string) {
+  return Promise.all([
+    queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectLists(projectId) }),
+    queryClient.invalidateQueries({ queryKey: projectFilesKeys.projectFolders(projectId) }),
+    queryClient.invalidateQueries({ queryKey: projectFilesKeys.records(projectId) }),
+  ])
+}
diff --git a/apps/sim/hooks/queries/projects.ts b/apps/sim/hooks/queries/projects.ts
index 97397ee4c04..ad0f36e5203 100644
--- a/apps/sim/hooks/queries/projects.ts
+++ b/apps/sim/hooks/queries/projects.ts
@@ -1,16 +1,18 @@
-import { useInfiniteQuery } from '@tanstack/react-query'
+import { useInfiniteQuery, useQuery } from '@tanstack/react-query'
 import { isApiClientError } from '@/lib/api/client/errors'
 import { requestJson } from '@/lib/api/client/request'
-import { listProjectsContract } from '@/lib/api/contracts/projects'
+import { listProjectsContract, type Project } from '@/lib/api/contracts/projects'
 
 const PROJECT_LIST_STALE_TIME = 30_000
 const projectKeys = {
   all: ['projects'] as const,
   lists: () => [...projectKeys.all, 'list'] as const,
-  list: (organizationId: string) => [...projectKeys.lists(), organizationId] as const,
+  list: (organizationId?: string) => [...projectKeys.lists(), organizationId ?? null] as const,
+  inventory: (organizationId?: string) =>
+    [...projectKeys.lists(), organizationId ?? null, 'inventory'] as const,
 }
 
-export function useProjects(organizationId: string) {
+export function useProjects(organizationId?: string, options?: { enabled?: boolean }) {
   return useInfiniteQuery({
     queryKey: projectKeys.list(organizationId),
     initialPageParam: null as string | null,
@@ -27,6 +29,29 @@ export function useProjects(organizationId: string) {
         error.status === 408 ||
         error.status === 429 ||
         (error.status >= 500 && error.status !== 503)),
-    enabled: Boolean(organizationId),
+    enabled: organizationId !== '' && (options?.enabled ?? true),
+  })
+}
+
+/** Complete authorized Project hierarchy for organization resource pickers. */
+export function useProjectInventory(organizationId?: string, enabled = true) {
+  return useQuery({
+    queryKey: projectKeys.inventory(organizationId),
+    queryFn: async ({ signal }) => {
+      const projects: Project[] = []
+      let cursor: string | undefined
+      do {
+        const page = await requestJson(listProjectsContract, {
+          query: { organizationId, cursor, limit: 100 },
+          signal,
+        })
+        projects.push(...page.projects)
+        cursor = page.nextCursor ?? undefined
+      } while (cursor)
+      return projects
+    },
+    enabled: Boolean(organizationId) && enabled,
+    staleTime: PROJECT_LIST_STALE_TIME,
+    retry: false,
   })
 }
diff --git a/apps/sim/hooks/queries/public-shares.ts b/apps/sim/hooks/queries/public-shares.ts
index 5f33d20d163..d6ba42e0ab7 100644
--- a/apps/sim/hooks/queries/public-shares.ts
+++ b/apps/sim/hooks/queries/public-shares.ts
@@ -4,71 +4,50 @@ import { requestJson } from '@/lib/api/client/request'
 import {
   type AuthenticatePublicFileResponse,
   authenticatePublicFileContract,
-  getFileShareContract,
   requestPublicFileOtpContract,
-  type ShareRecord,
   type UpsertFileShareBody,
-  upsertFileShareContract,
   type VerifyPublicFileOtpResponse,
   verifyPublicFileOtpContract,
 } from '@/lib/api/contracts/public-shares'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { getFileShareQueryAdapter } from '@/hooks/queries/utils/file-share-query-adapters'
 
 export const FILE_SHARE_STALE_TIME = 30 * 1000
 
-/**
- * Query key factories for public shares
- */
-const shareKeys = {
-  all: ['publicShares'] as const,
-  details: () => [...shareKeys.all, 'detail'] as const,
-  detail: (workspaceId: string, fileId: string) =>
-    [...shareKeys.details(), workspaceId, fileId] as const,
-}
-
-async function fetchFileShare(
-  workspaceId: string,
+export function useFileShare(
+  owner: EditableFileOwner,
   fileId: string,
-  signal?: AbortSignal
-): Promise<ShareRecord | null> {
-  const data = await requestJson(getFileShareContract, {
-    params: { id: workspaceId, fileId },
-    signal,
-  })
-  return data.share
-}
-
-export function useFileShare(workspaceId: string, fileId: string, options?: { enabled?: boolean }) {
-  return useQuery({
-    queryKey: shareKeys.detail(workspaceId, fileId),
-    queryFn: ({ signal }) => fetchFileShare(workspaceId, fileId, signal),
-    enabled: Boolean(workspaceId) && Boolean(fileId) && (options?.enabled ?? true),
+  options?: { enabled?: boolean }
+) {
+  const adapter = getFileShareQueryAdapter(owner)
+  const query = useQuery({
+    queryKey: adapter.key(owner.entityId, fileId),
+    queryFn: ({ signal }) => adapter.read(owner.entityId, fileId, signal),
+    enabled: Boolean(fileId) && (options?.enabled ?? true),
     staleTime: FILE_SHARE_STALE_TIME,
     refetchOnMount: 'always',
   })
+  return { ...query, data: query.data === undefined ? undefined : adapter.state(query.data) }
 }
 
 interface UpsertFileShareVariables extends UpsertFileShareBody {
-  workspaceId: string
+  owner: EditableFileOwner
   fileId: string
 }
 
 export function useUpsertFileShare() {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: ({ workspaceId, fileId, ...body }: UpsertFileShareVariables) =>
-      requestJson(upsertFileShareContract, {
-        params: { id: workspaceId, fileId },
-        body,
-      }),
-    onSuccess: (data, { workspaceId, fileId }) => {
-      queryClient.setQueryData(shareKeys.detail(workspaceId, fileId), data.share)
+    mutationFn: ({ owner, fileId, ...body }: UpsertFileShareVariables) =>
+      getFileShareQueryAdapter(owner).update(owner.entityId, fileId, body),
+    onSuccess: (data, { owner, fileId }) => {
+      getFileShareQueryAdapter(owner).store(queryClient, owner.entityId, fileId, data.share)
     },
     onError: (error) => {
       toast.error(error.message)
     },
-    onSettled: (_data, _error, { workspaceId }) => {
-      queryClient.invalidateQueries({ queryKey: workspaceFilesKeys.workspaceLists(workspaceId) })
+    onSettled: (_data, _error, { owner, fileId }) => {
+      getFileShareQueryAdapter(owner).invalidate(queryClient, owner.entityId, fileId)
     },
   })
 }
diff --git a/apps/sim/hooks/queries/utils/file-browser-owner-adapters.ts b/apps/sim/hooks/queries/utils/file-browser-owner-adapters.ts
new file mode 100644
index 00000000000..e743662effd
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/file-browser-owner-adapters.ts
@@ -0,0 +1,162 @@
+import type { QueryClient } from '@tanstack/react-query'
+import { requestJson, requestRaw } from '@/lib/api/client/request'
+import { extractProjectFileContract } from '@/lib/api/contracts/project-file-extraction'
+import { listProjectFileFoldersContract } from '@/lib/api/contracts/project-file-folders'
+import {
+  listProjectFileVersionsContract,
+  readProjectFileVersionContentContract,
+  revertProjectFileVersionContract,
+} from '@/lib/api/contracts/project-file-versions'
+import { listWorkspaceFileFoldersContract } from '@/lib/api/contracts/workspace-file-folders'
+import {
+  downloadWorkspaceFileVersionContract,
+  type ListWorkspaceFileVersionsResponse,
+  listWorkspaceFileVersionsContract,
+  type RevertWorkspaceFileVersionBody,
+  revertWorkspaceFileVersionContract,
+} from '@/lib/api/contracts/workspace-file-versions'
+import {
+  type ExtractWorkspaceFileResponse,
+  extractWorkspaceFileContract,
+} from '@/lib/api/contracts/workspace-files'
+import { getWorkspacePermissionsContract } from '@/lib/api/contracts/workspaces'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
+import { workspaceFileFolderKeys } from '@/hooks/queries/workspace-file-folders'
+
+interface FileDestinationFolders {
+  folders: { id: string; name: string; path: string }[]
+  canWrite: boolean
+}
+
+interface FileBrowserOwnerAdapter {
+  extract(id: string, fileId: string): Promise<ExtractWorkspaceFileResponse>
+  history(
+    id: string,
+    fileId: string,
+    cursor?: string,
+    signal?: AbortSignal
+  ): Promise<ListWorkspaceFileVersionsResponse>
+  downloadVersion(
+    id: string,
+    fileId: string,
+    version: number,
+    signal?: AbortSignal
+  ): Promise<Response>
+  revert(
+    id: string,
+    fileId: string,
+    version: number,
+    body: RevertWorkspaceFileVersionBody
+  ): Promise<{ reverted: boolean }>
+  destinationFolders(id: string, signal?: AbortSignal): Promise<FileDestinationFolders>
+  invalidate(client: QueryClient, id: string, fileId?: string): Promise<void>
+}
+
+const FILE_BROWSER_ADAPTERS: FileOwnerAdapters<FileBrowserOwnerAdapter> = {
+  workspace: {
+    extract: (id, fileId) => requestJson(extractWorkspaceFileContract, { params: { id, fileId } }),
+    history: (id, fileId, cursor, signal) =>
+      requestJson(listWorkspaceFileVersionsContract, {
+        params: { id, fileId },
+        query: { cursor, limit: 30, sortOrder: 'desc' },
+        signal,
+      }),
+    downloadVersion: (id, fileId, version, signal) =>
+      requestRaw(
+        downloadWorkspaceFileVersionContract,
+        {
+          params: { id, fileId, version },
+          query: {},
+          signal,
+        },
+        { cache: 'no-store' }
+      ),
+    revert: (id, fileId, version, body) =>
+      requestJson(revertWorkspaceFileVersionContract, {
+        params: { id, fileId, version },
+        query: {},
+        body,
+      }),
+    async destinationFolders(id, signal) {
+      const [result, permissions] = await Promise.all([
+        requestJson(listWorkspaceFileFoldersContract, {
+          params: { id },
+          query: { scope: 'active' },
+          signal,
+        }),
+        requestJson(getWorkspacePermissionsContract, { params: { id }, signal }),
+      ])
+      const role = permissions.viewer?.permissionType
+      return { folders: result.folders, canWrite: role === 'write' || role === 'admin' }
+    },
+    async invalidate(client, id, fileId) {
+      await Promise.all([
+        client.invalidateQueries({ queryKey: workspaceFilesKeys.workspaceLists(id) }),
+        client.invalidateQueries({ queryKey: workspaceFileFolderKeys.workspaceLists(id) }),
+        client.invalidateQueries({ queryKey: workspaceFilesKeys.storageInfo() }),
+        ...(fileId
+          ? [
+              client.invalidateQueries({ queryKey: workspaceFilesKeys.contentFile(id, fileId) }),
+              client.invalidateQueries({ queryKey: workspaceFilesKeys.record(id, fileId) }),
+            ]
+          : []),
+      ])
+    },
+  },
+  project: {
+    extract: (id, fileId) => requestJson(extractProjectFileContract, { params: { id, fileId } }),
+    history: (id, fileId, cursor, signal) =>
+      requestJson(listProjectFileVersionsContract, {
+        params: { id, fileId },
+        query: { cursor, limit: 30, sortOrder: 'desc' },
+        signal,
+      }),
+    downloadVersion: (id, fileId, version, signal) =>
+      requestRaw(
+        readProjectFileVersionContentContract,
+        {
+          params: { id, fileId, version },
+          query: {},
+          signal,
+        },
+        { cache: 'no-store' }
+      ),
+    revert: (id, fileId, version, body) =>
+      requestJson(revertProjectFileVersionContract, {
+        params: { id, fileId, version },
+        query: {},
+        body,
+      }),
+    async destinationFolders(id, signal) {
+      const result = await requestJson(listProjectFileFoldersContract, {
+        params: { id },
+        query: { scope: 'active' },
+        signal,
+      })
+      return { folders: result.folders, canWrite: result.capabilities.canWrite }
+    },
+    async invalidate(client, id, fileId) {
+      await Promise.all([
+        client.invalidateQueries({ queryKey: projectFilesKeys.projectLists(id) }),
+        client.invalidateQueries({ queryKey: projectFilesKeys.projectFolders(id) }),
+        ...(fileId
+          ? [
+              client.invalidateQueries({ queryKey: projectFilesKeys.record(id, fileId) }),
+              client.invalidateQueries({ queryKey: projectFilesKeys.contentFile(id, fileId) }),
+            ]
+          : []),
+      ])
+    },
+  },
+}
+
+/** Browser controls share behavior while each owner retains its authenticated transport and cache. */
+export function getFileBrowserOwnerAdapter(owner: EditableFileOwner): FileBrowserOwnerAdapter {
+  return requireFileOwnerAdapter(FILE_BROWSER_ADAPTERS, owner)
+}
diff --git a/apps/sim/hooks/queries/utils/file-owner-query-adapters.ts b/apps/sim/hooks/queries/utils/file-owner-query-adapters.ts
new file mode 100644
index 00000000000..4c7e051e911
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/file-owner-query-adapters.ts
@@ -0,0 +1,127 @@
+import type { QueryClient, QueryFilters, QueryKey } from '@tanstack/react-query'
+import { requestJson } from '@/lib/api/client/request'
+import {
+  getProjectCsvPreviewContract,
+  type ProjectFileRecord,
+  updateProjectFileContentContract,
+} from '@/lib/api/contracts/project-files'
+import {
+  getWorkspaceCsvPreviewContract,
+  type WorkspaceCsvPreviewResponse,
+} from '@/lib/api/contracts/workspace-file-table'
+import {
+  type UpdateWorkspaceFileContentBody,
+  updateWorkspaceFileContentContract,
+} from '@/lib/api/contracts/workspace-files'
+import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { FileOwner } from '@/lib/workspace-files/ownership'
+import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
+import { workspaceFileTableKeys } from '@/hooks/queries/utils/file-table-keys'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+import {
+  getWorkspaceFilesQueryOptions,
+  workspaceFilesKeys,
+} from '@/hooks/queries/utils/workspace-file-query'
+
+type FileRecord = WorkspaceFileRecord | ProjectFileRecord
+interface FileOwnerQueryAdapter {
+  contentKey(
+    id: string,
+    fileId: string,
+    mode: 'text' | 'raw' | 'binary',
+    key: string,
+    version?: string | number
+  ): QueryKey
+  recordFilter(id: string, fileId: string): QueryFilters
+  recoveryFilters(id: string, fileId: string): QueryFilters[]
+  invalidationFilters(id: string, fileId: string): QueryFilters[]
+  reloadRecord(client: QueryClient, id: string, fileId: string): Promise<FileRecord>
+  updateContent(
+    id: string,
+    fileId: string,
+    body: UpdateWorkspaceFileContentBody
+  ): Promise<{ file: FileRecord }>
+  csvKey(id: string, fileId: string, key: string, version?: number): QueryKey
+  readCsv(
+    id: string,
+    fileId: string,
+    key: string,
+    version?: number,
+    signal?: AbortSignal
+  ): Promise<WorkspaceCsvPreviewResponse>
+}
+
+const FILE_QUERY_ADAPTERS: FileOwnerAdapters<FileOwnerQueryAdapter> = {
+  workspace: {
+    contentKey: (id, fileId, mode, key, version) => [
+      ...workspaceFilesKeys.content(id, fileId, mode, key),
+      ...(mode === 'binary' && version != null ? [version] : []),
+    ],
+    recordFilter: (id) => ({ queryKey: workspaceFilesKeys.workspaceLists(id) }),
+    recoveryFilters: (id) => [{ queryKey: workspaceFilesKeys.workspaceLists(id) }],
+    invalidationFilters: (id, fileId) => [
+      { queryKey: workspaceFilesKeys.contentFile(id, fileId) },
+      { queryKey: workspaceFilesKeys.workspaceLists(id) },
+    ],
+    async reloadRecord(client, id, fileId) {
+      await client.cancelQueries({ queryKey: workspaceFilesKeys.workspaceLists(id) })
+      const files = await client.fetchQuery({ ...getWorkspaceFilesQueryOptions(id), staleTime: 0 })
+      const file = files.find((record) => record.id === fileId)
+      if (!file) throw new Error('File no longer exists')
+      if (!file.contentUpdatedAt) throw new Error('The latest file version is unavailable')
+      return file
+    },
+    updateContent: (id, fileId, body) =>
+      requestJson(updateWorkspaceFileContentContract, { params: { id, fileId }, body }),
+    csvKey: workspaceFileTableKeys.preview,
+    readCsv: (id, fileId, key, version, signal) =>
+      requestJson(getWorkspaceCsvPreviewContract, {
+        params: { id, fileId },
+        query: version != null ? { key, v: version } : { key },
+        signal,
+      }),
+  },
+  project: {
+    contentKey: (id, fileId, mode, key, version) => [
+      ...projectFilesKeys.content(id, fileId, mode, key),
+      ...(mode === 'binary' ? [version] : []),
+    ],
+    recordFilter: (id, fileId) => ({ queryKey: projectFilesKeys.record(id, fileId), exact: true }),
+    recoveryFilters: (id, fileId) => [
+      { queryKey: projectFilesKeys.record(id, fileId), exact: true },
+      { queryKey: projectFilesKeys.projectLists(id) },
+    ],
+    invalidationFilters: (id, fileId) => [
+      { queryKey: projectFilesKeys.contentFile(id, fileId) },
+      { queryKey: projectFilesKeys.record(id, fileId) },
+      { queryKey: projectFilesKeys.projectLists(id) },
+    ],
+    async reloadRecord(client, id, fileId) {
+      const options = getProjectFileQueryOptions(id, fileId)
+      await client.cancelQueries({ queryKey: options.queryKey, exact: true })
+      const record = await client.fetchQuery({ ...options, staleTime: 0 })
+      return record.file
+    },
+    updateContent: (id, fileId, body) =>
+      requestJson(updateProjectFileContentContract, { params: { id, fileId }, body }),
+    csvKey: workspaceFileTableKeys.projectPreview,
+    readCsv: (id, fileId, key, version, signal) =>
+      requestJson(getProjectCsvPreviewContract, {
+        params: { id, fileId },
+        query: version != null ? { key, v: version } : { key },
+        signal,
+      }),
+  },
+}
+
+/** Explicit owners take precedence; the workspace ID supports callers predating owner metadata. */
+export function resolveFileQueryOwner(owner: FileOwner | undefined, workspaceId?: string) {
+  const resolved =
+    owner ?? (workspaceId ? { entityType: 'workspace' as const, entityId: workspaceId } : undefined)
+  if (!resolved) return undefined
+  return { id: resolved.entityId, adapter: requireFileOwnerAdapter(FILE_QUERY_ADAPTERS, resolved) }
+}
diff --git a/apps/sim/hooks/queries/utils/file-share-query-adapters.ts b/apps/sim/hooks/queries/utils/file-share-query-adapters.ts
new file mode 100644
index 00000000000..69c0bed92a2
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/file-share-query-adapters.ts
@@ -0,0 +1,90 @@
+import type { QueryClient, QueryKey } from '@tanstack/react-query'
+import { requestJson } from '@/lib/api/client/request'
+import {
+  type GetProjectFileShareResponse,
+  getProjectFileShareContract,
+  updateProjectFileShareContract,
+} from '@/lib/api/contracts/project-file-shares'
+import {
+  type GetFileShareResponse,
+  getFileShareContract,
+  type ShareRecord,
+  type UpsertFileShareBody,
+  upsertFileShareContract,
+} from '@/lib/api/contracts/public-shares'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
+
+type ShareCacheValue = ShareRecord | null | GetProjectFileShareResponse
+interface FileShareQueryAdapter {
+  ownerKey(id: string): QueryKey
+  key(id: string, fileId: string): QueryKey
+  read(id: string, fileId: string, signal?: AbortSignal): Promise<ShareCacheValue>
+  state(
+    value: ShareCacheValue
+  ): GetFileShareResponse & Partial<Pick<GetProjectFileShareResponse, 'policy' | 'capabilities'>>
+  update(id: string, fileId: string, body: UpsertFileShareBody): Promise<{ share: ShareRecord }>
+  store(client: QueryClient, id: string, fileId: string, share: ShareRecord): void
+  invalidate(client: QueryClient, id: string, fileId: string): void
+}
+const shareKeys = {
+  all: ['publicShares'] as const,
+  details: () => [...shareKeys.all, 'detail'] as const,
+  workspaceOwner: (id: string) => [...shareKeys.details(), id] as const,
+  workspace: (id: string, fileId: string) => [...shareKeys.workspaceOwner(id), fileId] as const,
+  projectOwner: (id: string) => [...shareKeys.details(), 'project', id] as const,
+  project: (id: string, fileId: string) => [...shareKeys.projectOwner(id), fileId] as const,
+}
+const SHARE_QUERY_ADAPTERS: FileOwnerAdapters<FileShareQueryAdapter> = {
+  workspace: {
+    ownerKey: shareKeys.workspaceOwner,
+    key: shareKeys.workspace,
+    async read(id, fileId, signal) {
+      return (await requestJson(getFileShareContract, { params: { id, fileId }, signal })).share
+    },
+    state(value) {
+      if (value && 'share' in value) throw new Error('Invalid environment share cache')
+      return { share: value }
+    },
+    update: (id, fileId, body) =>
+      requestJson(upsertFileShareContract, { params: { id, fileId }, body }),
+    store: (client, id, fileId, share) => {
+      client.setQueryData(shareKeys.workspace(id, fileId), share)
+    },
+    invalidate: (client, id, fileId) => {
+      void client.invalidateQueries({ queryKey: shareKeys.workspace(id, fileId) })
+      void client.invalidateQueries({ queryKey: workspaceFilesKeys.workspaceLists(id) })
+    },
+  },
+  project: {
+    ownerKey: shareKeys.projectOwner,
+    key: shareKeys.project,
+    read: (id, fileId, signal) =>
+      requestJson(getProjectFileShareContract, { params: { id, fileId }, signal }),
+    state(value) {
+      if (!value || !('policy' in value)) throw new Error('Invalid Project share cache')
+      return value
+    },
+    update: (id, fileId, body) =>
+      requestJson(updateProjectFileShareContract, { params: { id, fileId }, body }),
+    store(client, id, fileId, share) {
+      client.setQueryData<GetProjectFileShareResponse>(shareKeys.project(id, fileId), (current) =>
+        current ? { ...current, share } : undefined
+      )
+    },
+    invalidate(client, id, fileId) {
+      void client.invalidateQueries({ queryKey: shareKeys.project(id, fileId) })
+      void client.invalidateQueries({ queryKey: projectFilesKeys.projectLists(id) })
+      void client.invalidateQueries({ queryKey: projectFilesKeys.record(id, fileId) })
+    },
+  },
+}
+
+export function getFileShareQueryAdapter(owner: EditableFileOwner): FileShareQueryAdapter {
+  return requireFileOwnerAdapter(SHARE_QUERY_ADAPTERS, owner)
+}
diff --git a/apps/sim/hooks/queries/utils/file-table-keys.ts b/apps/sim/hooks/queries/utils/file-table-keys.ts
new file mode 100644
index 00000000000..662de34f3a5
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/file-table-keys.ts
@@ -0,0 +1,14 @@
+/**
+ * Query keys for the streamed CSV file-viewer preview. `key` (storage object key) and
+ * `version` (the record's `updatedAt`) are folded in so a re-upload or edit busts the cache.
+ */
+export const workspaceFileTableKeys = {
+  all: ['workspaceFileTable'] as const,
+  projectPreviews: (projectId: string) =>
+    [...workspaceFileTableKeys.all, 'project-preview', projectId] as const,
+  projectPreview: (projectId: string, fileId: string, key: string, version?: number) =>
+    [...workspaceFileTableKeys.projectPreviews(projectId), fileId, key, version ?? ''] as const,
+  previews: () => [...workspaceFileTableKeys.all, 'preview'] as const,
+  preview: (workspaceId: string, fileId: string, key: string, version?: number) =>
+    [...workspaceFileTableKeys.previews(), workspaceId, fileId, key, version ?? ''] as const,
+}
diff --git a/apps/sim/hooks/queries/utils/project-file-keys.ts b/apps/sim/hooks/queries/utils/project-file-keys.ts
new file mode 100644
index 00000000000..824b86504ed
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/project-file-keys.ts
@@ -0,0 +1,31 @@
+import type { ListProjectFileFoldersQuery } from '@/lib/api/contracts/project-file-folders'
+import type { ListProjectFilesQuery } from '@/lib/api/contracts/project-files'
+
+export const PROJECT_FILE_STALE_TIME = 30_000
+
+export const projectFilesKeys = {
+  all: ['project-files'] as const,
+  project: (projectId?: string) => [...projectFilesKeys.all, projectId ?? ''] as const,
+  projectLists: (projectId?: string) => [...projectFilesKeys.project(projectId), 'list'] as const,
+  list: (projectId: string | undefined, filters: Omit<ListProjectFilesQuery, 'cursor'>) =>
+    [...projectFilesKeys.projectLists(projectId), filters] as const,
+  inventory: (projectId?: string) =>
+    [...projectFilesKeys.projectLists(projectId), 'inventory'] as const,
+  records: (projectId?: string) => [...projectFilesKeys.project(projectId), 'record'] as const,
+  record: (projectId?: string, fileId?: string) =>
+    [...projectFilesKeys.records(projectId), fileId ?? ''] as const,
+  contentFile: (projectId?: string, fileId?: string) =>
+    [...projectFilesKeys.record(projectId, fileId), 'content'] as const,
+  content: (
+    projectId: string | undefined,
+    fileId: string | undefined,
+    mode: 'text' | 'raw' | 'binary',
+    storageKey?: string
+  ) => [...projectFilesKeys.contentFile(projectId, fileId), mode, storageKey ?? ''] as const,
+  projectFolders: (projectId?: string) =>
+    [...projectFilesKeys.project(projectId), 'folders'] as const,
+  folders: (projectId: string | undefined, scope: ListProjectFileFoldersQuery['scope']) =>
+    [...projectFilesKeys.projectFolders(projectId), scope] as const,
+  workspaceProject: (workspaceId?: string) =>
+    [...projectFilesKeys.all, 'workspace-project', workspaceId ?? ''] as const,
+}
diff --git a/apps/sim/hooks/queries/utils/workspace-file-query.ts b/apps/sim/hooks/queries/utils/workspace-file-query.ts
new file mode 100644
index 00000000000..a3e6511f0cb
--- /dev/null
+++ b/apps/sim/hooks/queries/utils/workspace-file-query.ts
@@ -0,0 +1,69 @@
+import { requestJson } from '@/lib/api/client/request'
+import { listWorkspaceFilesContract } from '@/lib/api/contracts/workspace-files'
+import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+
+export type WorkspaceFileQueryScope = 'active' | 'archived'
+
+/**
+ * Query key factories for workspace files
+ */
+export const workspaceFilesKeys = {
+  all: ['workspaceFiles'] as const,
+  lists: () => [...workspaceFilesKeys.all, 'list'] as const,
+  workspaceLists: (workspaceId: string) => [...workspaceFilesKeys.lists(), workspaceId] as const,
+  list: (workspaceId: string, scope: WorkspaceFileQueryScope = 'active') =>
+    [...workspaceFilesKeys.workspaceLists(workspaceId), scope] as const,
+  records: () => [...workspaceFilesKeys.all, 'record'] as const,
+  record: (workspaceId: string, fileId: string) =>
+    [...workspaceFilesKeys.records(), workspaceId, fileId] as const,
+  contents: () => [...workspaceFilesKeys.all, 'content'] as const,
+  contentFile: (workspaceId: string, fileId: string) =>
+    [...workspaceFilesKeys.contents(), workspaceId, fileId] as const,
+  content: (
+    workspaceId: string,
+    fileId: string,
+    mode: 'text' | 'raw' | 'binary' = 'text',
+    storageKey?: string
+  ) =>
+    [
+      ...workspaceFilesKeys.contentFile(workspaceId, fileId),
+      mode,
+      ...(storageKey ? [storageKey] : []),
+    ] as const,
+  storageInfo: () => [...workspaceFilesKeys.all, 'storageInfo'] as const,
+  cloudConfigured: () => [...workspaceFilesKeys.all, 'cloudConfigured'] as const,
+}
+
+export const WORKSPACE_FILES_LIST_STALE_TIME = 30 * 1000
+/**
+ * Fetch workspace files from API
+ */
+export async function fetchWorkspaceFiles(
+  workspaceId: string,
+  scope: WorkspaceFileQueryScope = 'active',
+  signal?: AbortSignal
+): Promise<WorkspaceFileRecord[]> {
+  const data = await requestJson(listWorkspaceFilesContract, {
+    params: { id: workspaceId },
+    query: { scope },
+    signal,
+  })
+  return data.success ? data.files : []
+}
+
+/**
+ * Shared options for the workspace-file list, so an imperative caller can
+ * `fetchQuery` the same cache entry {@link useWorkspaceFiles} populates instead
+ * of refetching by key and reading the result back out of the cache.
+ */
+export function getWorkspaceFilesQueryOptions(
+  workspaceId: string,
+  scope: WorkspaceFileQueryScope = 'active'
+) {
+  return {
+    queryKey: workspaceFilesKeys.list(workspaceId, scope),
+    queryFn: ({ signal }: { signal?: AbortSignal }) =>
+      fetchWorkspaceFiles(workspaceId, scope, signal),
+    staleTime: WORKSPACE_FILES_LIST_STALE_TIME, // 30 seconds - files can change frequently
+  }
+}
diff --git a/apps/sim/hooks/queries/workspace-file-folders.ts b/apps/sim/hooks/queries/workspace-file-folders.ts
index d7dd930dcd1..07084e9a1e2 100644
--- a/apps/sim/hooks/queries/workspace-file-folders.ts
+++ b/apps/sim/hooks/queries/workspace-file-folders.ts
@@ -11,12 +11,11 @@ import {
   updateWorkspaceFileFolderContract,
   type WorkspaceFileFolderApi,
 } from '@/lib/api/contracts/workspace-file-folders'
-import { extractWorkspaceFileContract } from '@/lib/api/contracts/workspace-files'
 import {
   buildWorkspaceFileFolderDisplayPath,
   parseWorkspaceFileFolderDisplayPath,
 } from '@/lib/workspace-files/folder-display-path'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 
 type WorkspaceFileFolderScope = 'active' | 'archived' | 'all'
 export type { WorkspaceFileFolderApi }
@@ -89,25 +88,6 @@ export function useCreateWorkspaceFileFolder() {
   })
 }
 
-export function useExtractWorkspaceFile() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (variables: { workspaceId: string; fileId: string; fileName: string }) =>
-      requestJson(extractWorkspaceFileContract, {
-        params: { id: variables.workspaceId, fileId: variables.fileId },
-      }),
-    onSuccess: (data, variables) => {
-      toast.success(`Unzipped "${variables.fileName}" into "${data.folderName}"`)
-    },
-    onError: (error) => {
-      toast.error(toError(error).message)
-    },
-    onSettled: (_data, _error, variables) => {
-      invalidateWorkspaceFileBrowsers(queryClient, variables.workspaceId)
-    },
-  })
-}
-
 export function useUpdateWorkspaceFileFolder() {
   const queryClient = useQueryClient()
   return useMutation({
diff --git a/apps/sim/hooks/queries/workspace-file-table.ts b/apps/sim/hooks/queries/workspace-file-table.ts
index 98eeef30078..102aa422247 100644
--- a/apps/sim/hooks/queries/workspace-file-table.ts
+++ b/apps/sim/hooks/queries/workspace-file-table.ts
@@ -1,52 +1,32 @@
 import { useQuery } from '@tanstack/react-query'
-import { requestJson } from '@/lib/api/client/request'
-import {
-  getWorkspaceCsvPreviewContract,
-  type WorkspaceCsvPreviewResponse,
-} from '@/lib/api/contracts/workspace-file-table'
+import { resolveFileQueryOwner } from '@/hooks/queries/utils/file-owner-query-adapters'
+import { workspaceFileTableKeys } from '@/hooks/queries/utils/file-table-keys'
+import { useFileContentSource } from '@/hooks/use-file-content-source'
 
-/**
- * Query keys for the streamed CSV file-viewer preview. `key` (storage object key) and
- * `version` (the record's `updatedAt`) are folded in so a re-upload or edit busts the cache.
- */
 export const WORKSPACE_CSV_PREVIEW_STALE_TIME = 30 * 1000
 
-const workspaceFileTableKeys = {
-  all: ['workspaceFileTable'] as const,
-  previews: () => [...workspaceFileTableKeys.all, 'preview'] as const,
-  preview: (workspaceId: string, fileId: string, key: string, version?: number) =>
-    [...workspaceFileTableKeys.previews(), workspaceId, fileId, key, version ?? ''] as const,
-}
-
-async function fetchWorkspaceCsvPreview(
-  workspaceId: string,
-  fileId: string,
-  key: string,
-  version: number | undefined,
-  signal?: AbortSignal
-): Promise<WorkspaceCsvPreviewResponse> {
-  return requestJson(getWorkspaceCsvPreviewContract, {
-    params: { id: workspaceId, fileId },
-    query: version != null ? { key, v: version } : { key },
-    signal,
-  })
-}
-
 /**
  * Fetches the first {@link CSV_PREVIEW_MAX_ROWS} rows of a CSV via the streaming preview route.
  * The server reads only that prefix from storage, so this is safe for arbitrarily large files.
  */
 export function useWorkspaceCsvPreview(
-  workspaceId: string,
+  workspaceId: string | undefined,
   fileId: string,
   key: string,
   version?: number,
   options?: { enabled?: boolean }
 ) {
+  const source = useFileContentSource()
+  const ownerQuery = resolveFileQueryOwner(source.owner, workspaceId)
   return useQuery({
-    queryKey: workspaceFileTableKeys.preview(workspaceId, fileId, key, version),
-    queryFn: ({ signal }) => fetchWorkspaceCsvPreview(workspaceId, fileId, key, version, signal),
-    enabled: !!workspaceId && !!fileId && !!key && (options?.enabled ?? true),
+    queryKey:
+      ownerQuery?.adapter.csvKey(ownerQuery.id, fileId, key, version) ??
+      workspaceFileTableKeys.preview('', fileId, key, version),
+    queryFn: ({ signal }) => {
+      if (!ownerQuery) throw new Error('File owner is required')
+      return ownerQuery.adapter.readCsv(ownerQuery.id, fileId, key, version, signal)
+    },
+    enabled: Boolean(ownerQuery) && !!fileId && !!key && (options?.enabled ?? true),
     staleTime: WORKSPACE_CSV_PREVIEW_STALE_TIME,
   })
 }
diff --git a/apps/sim/hooks/queries/workspace-files.test.tsx b/apps/sim/hooks/queries/workspace-files.test.tsx
index c07fe6ecbba..0333c6d6e95 100644
--- a/apps/sim/hooks/queries/workspace-files.test.tsx
+++ b/apps/sim/hooks/queries/workspace-files.test.tsx
@@ -9,6 +9,9 @@
  */
 
 import { act, type ReactNode } from 'react'
+import { toast } from '@sim/emcn'
+import { flushMacrotask } from '@sim/testing/helpers/async'
+import { createDeferred } from '@sim/testing/helpers/deferred'
 import {
   apiClientRequestMock,
   apiClientRequestMockFns,
@@ -22,14 +25,18 @@ import {
   updateWorkspaceFileContentContract,
 } from '@/lib/api/contracts/workspace-files'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import { getProjectFileQueryOptions } from '@/hooks/queries/project-files'
+import { resolveFileQueryOwner } from '@/hooks/queries/utils/file-owner-query-adapters'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 import {
   useAddressedWorkspaceFileRecord,
   useReloadWorkspaceFileContent,
   useUpdateWorkspaceFileContent,
+  useUploadWorkspaceFile,
   useWorkspaceFileContent,
   useWorkspaceFiles,
   type WorkspaceFileContentResult,
-  workspaceFilesKeys,
 } from '@/hooks/queries/workspace-files'
 
 const mockRequestJson = apiClientRequestMockFns.mockRequestJson
@@ -147,6 +154,7 @@ describe('useReloadWorkspaceFileContent', () => {
       },
     })
     root = createRoot(document.createElement('div'))
+    mockRequestJson.mockReset()
     mockRequestJson.mockResolvedValue({ success: true, files: [file] })
     function Probe() {
       mutation = useReloadWorkspaceFileContent()
@@ -166,6 +174,50 @@ describe('useReloadWorkspaceFileContent', () => {
     client.clear()
   })
 
+  it.each([false, true])(
+    'keeps Project metadata current when a reload races an older read (cached=%s)',
+    async (cached) => {
+      const owner = { entityType: 'project', entityId: 'project-1' } as const
+      const oldRecord = {
+        file: { ...file, owner, key: 'project/project-1/old.md' },
+        capabilities: { canRead: true, canWrite: true },
+      }
+      const currentRecord = {
+        ...oldRecord,
+        file: { ...oldRecord.file, key: 'project/project-1/current.md' },
+      }
+      const query = getProjectFileQueryOptions(owner.entityId, file.id)
+      const olderRead = createDeferred<typeof oldRecord>()
+      const readStarted = createDeferred<void>()
+      if (cached) client.setQueryData(query.queryKey, oldRecord)
+      mockRequestJson
+        .mockImplementationOnce(() => {
+          readStarted.resolve()
+          return olderRead.promise
+        })
+        .mockResolvedValueOnce(currentRecord)
+      const pending = client.fetchQuery({ ...query, staleTime: 0 }).catch(() => undefined)
+      await readStarted.promise
+
+      const resolved = resolveFileQueryOwner(owner)
+      if (!resolved) throw new Error('Project adapter is unavailable')
+      try {
+        const reload = resolved.adapter.reloadRecord(client, resolved.id, file.id)
+        await flushMacrotask()
+        olderRead.resolve(oldRecord)
+        const reloaded = await reload
+        expect(reloaded.key).toBe(currentRecord.file.key)
+        await pending
+        expect(client.getQueryData(projectFilesKeys.record(owner.entityId, file.id))).toEqual(
+          currentRecord
+        )
+      } finally {
+        olderRead.resolve(oldRecord)
+        await pending
+      }
+    }
+  )
+
   it.each([false, true])(
     'recovers matching bytes and version after key rotation (raw=%s)',
     async (raw) => {
@@ -380,3 +432,51 @@ describe('addressed file metadata fallback', () => {
     }
   })
 })
+
+it.each(['abort-error', 'aborted-signal', 'failure'] as const)(
+  'suppresses only intentional upload cancellation notifications (%s)',
+  async (scenario) => {
+    const notifications: unknown[] = []
+    vi.spyOn(toast, 'error').mockImplementation((message) => {
+      notifications.push(message)
+      return 'toast'
+    })
+    const controller = new AbortController()
+    if (scenario === 'aborted-signal') controller.abort()
+    const failure =
+      scenario === 'abort-error'
+        ? new DOMException('Cancelled', 'AbortError')
+        : new Error('Provider failed')
+    mockRequestJson.mockRejectedValueOnce(failure)
+    const client = new QueryClient({ defaultOptions: { mutations: { retry: false } } })
+    const container = document.createElement('div')
+    const root = createRoot(container)
+    let upload: ReturnType<typeof useUploadWorkspaceFile> | undefined
+    function Probe() {
+      upload = useUploadWorkspaceFile()
+      return null
+    }
+    try {
+      await act(async () =>
+        root.render(
+          <QueryClientProvider client={client}>
+            <Probe />
+          </QueryClientProvider>
+        )
+      )
+      await act(async () => {
+        await expect(
+          upload?.mutateAsync({
+            workspaceId: 'workspace',
+            file: new File(['content'], 'upload.txt'),
+            signal: controller.signal,
+          })
+        ).rejects.toBe(failure)
+      })
+      expect(notifications.length).toBe(scenario === 'failure' ? 1 : 0)
+    } finally {
+      await act(async () => root.unmount())
+      client.clear()
+    }
+  }
+)
diff --git a/apps/sim/hooks/queries/workspace-files.ts b/apps/sim/hooks/queries/workspace-files.ts
index 028b6e5d696..8e391edffef 100644
--- a/apps/sim/hooks/queries/workspace-files.ts
+++ b/apps/sim/hooks/queries/workspace-files.ts
@@ -16,57 +16,31 @@ import {
   type CreateWorkspaceFileBody,
   createWorkspaceFileContract,
   deleteWorkspaceFileContract,
-  listWorkspaceFilesContract,
   readWorkspaceFileContract,
   renameWorkspaceFileContract,
   restoreWorkspaceFileContract,
   type UpdateWorkspaceFileContentBody,
-  updateWorkspaceFileContentContract,
   updateWorkspaceFileDimensionsContract,
 } from '@/lib/api/contracts/workspace-files'
 import { uploadWorkspaceFileSession } from '@/lib/uploads/client/session-upload'
 import { FileTextSizeError, readFileText } from '@/lib/uploads/client/text-content'
 import type { UploadProgressEvent } from '@/lib/uploads/client/types'
 import type { WorkspaceFileRecord } from '@/lib/uploads/contexts/workspace'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
 import type { UserFile } from '@/executor/types'
+import { resolveFileQueryOwner } from '@/hooks/queries/utils/file-owner-query-adapters'
 import { findWorkspaceFileBySrc } from '@/hooks/queries/utils/find-workspace-file-by-src'
+import {
+  fetchWorkspaceFiles,
+  getWorkspaceFilesQueryOptions,
+  WORKSPACE_FILES_LIST_STALE_TIME,
+  type WorkspaceFileQueryScope,
+  workspaceFilesKeys,
+} from '@/hooks/queries/utils/workspace-file-query'
 import { type ImageDimensionsSource, useFileContentSource } from '@/hooks/use-file-content-source'
 
 const logger = createLogger('WorkspaceFilesQuery')
 
-type WorkspaceFileQueryScope = 'active' | 'archived'
-
-/**
- * Query key factories for workspace files
- */
-export const workspaceFilesKeys = {
-  all: ['workspaceFiles'] as const,
-  lists: () => [...workspaceFilesKeys.all, 'list'] as const,
-  workspaceLists: (workspaceId: string) => [...workspaceFilesKeys.lists(), workspaceId] as const,
-  list: (workspaceId: string, scope: WorkspaceFileQueryScope = 'active') =>
-    [...workspaceFilesKeys.workspaceLists(workspaceId), scope] as const,
-  records: () => [...workspaceFilesKeys.all, 'record'] as const,
-  record: (workspaceId: string, fileId: string) =>
-    [...workspaceFilesKeys.records(), workspaceId, fileId] as const,
-  contents: () => [...workspaceFilesKeys.all, 'content'] as const,
-  contentFile: (workspaceId: string, fileId: string) =>
-    [...workspaceFilesKeys.contents(), workspaceId, fileId] as const,
-  content: (
-    workspaceId: string,
-    fileId: string,
-    mode: 'text' | 'raw' | 'binary' = 'text',
-    storageKey?: string
-  ) =>
-    [
-      ...workspaceFilesKeys.contentFile(workspaceId, fileId),
-      mode,
-      ...(storageKey ? [storageKey] : []),
-    ] as const,
-  storageInfo: () => [...workspaceFilesKeys.all, 'storageInfo'] as const,
-  cloudConfigured: () => [...workspaceFilesKeys.all, 'cloudConfigured'] as const,
-}
-
-const WORKSPACE_FILES_LIST_STALE_TIME = 30 * 1000
 export const WORKSPACE_FILE_CONTENT_STALE_TIME = 30 * 1000
 export const WORKSPACE_FILE_BINARY_STALE_TIME = 30 * 1000
 /** Cloud storage (S3/Blob) is env-driven and does not change at runtime. */
@@ -110,39 +84,6 @@ export function useAddressedWorkspaceFileRecord(
   })
 }
 
-/**
- * Fetch workspace files from API
- */
-async function fetchWorkspaceFiles(
-  workspaceId: string,
-  scope: WorkspaceFileQueryScope = 'active',
-  signal?: AbortSignal
-): Promise<WorkspaceFileRecord[]> {
-  const data = await requestJson(listWorkspaceFilesContract, {
-    params: { id: workspaceId },
-    query: { scope },
-    signal,
-  })
-  return data.success ? data.files : []
-}
-
-/**
- * Shared options for the workspace-file list, so an imperative caller can
- * `fetchQuery` the same cache entry {@link useWorkspaceFiles} populates instead
- * of refetching by key and reading the result back out of the cache.
- */
-export function getWorkspaceFilesQueryOptions(
-  workspaceId: string,
-  scope: WorkspaceFileQueryScope = 'active'
-) {
-  return {
-    queryKey: workspaceFilesKeys.list(workspaceId, scope),
-    queryFn: ({ signal }: { signal?: AbortSignal }) =>
-      fetchWorkspaceFiles(workspaceId, scope, signal),
-    staleTime: WORKSPACE_FILES_LIST_STALE_TIME, // 30 seconds - files can change frequently
-  }
-}
-
 /**
  * Hook to fetch workspace files
  */
@@ -239,6 +180,11 @@ class StaleStorageKeyError extends Error {
   }
 }
 
+interface UseStaleKeyRecoveryProps {
+  workspaceId: string | undefined
+  fileId?: string
+}
+
 /**
  * Re-resolve a workspace's file records after a read found its storage key superseded.
  *
@@ -258,25 +204,28 @@ class StaleStorageKeyError extends Error {
  * on the dead key showing a failure until something unrelated (a window focus, another consumer)
  * happens to re-resolve the record.
  */
-function useStaleKeyRecovery(workspaceId: string): (error: unknown) => void {
+function useStaleKeyRecovery({
+  workspaceId,
+  fileId,
+}: UseStaleKeyRecoveryProps): (error: unknown) => void {
   const queryClient = useQueryClient()
+  const source = useFileContentSource()
+  const ownerQuery = resolveFileQueryOwner(source.owner, workspaceId)
+  const adapter = ownerQuery?.adapter
+  const ownerId = ownerQuery?.id
   return useCallback(
     (error: unknown) => {
-      if (!workspaceId || !(error instanceof StaleStorageKeyError)) return
-      // Off this fetch's own cycle (one microtask): a refetch asked for from inside a `queryFn` — where
-      // this catch sits — is dropped by react-query, silently. This is what turned "one extra request"
-      // into "no recovery at all".
-      //
-      // `cancelRefetch` because a re-resolution has to OBSERVE the rotation: a record read already in
-      // flight was started before it, so it can only hand back the key we already know is dead.
+      if (!adapter || !ownerId || !(error instanceof StaleStorageKeyError)) return
+      // A refetch inside its own query cycle is dropped; cancel any older record read before recovering.
       void Promise.resolve().then(() =>
-        queryClient.refetchQueries(
-          { queryKey: workspaceFilesKeys.workspaceLists(workspaceId) },
-          { cancelRefetch: true }
+        Promise.all(
+          adapter
+            .recoveryFilters(ownerId, fileId ?? '')
+            .map((filter) => queryClient.refetchQueries(filter, { cancelRefetch: true }))
         )
       )
     },
-    [queryClient, workspaceId]
+    [queryClient, adapter, ownerId, fileId]
   )
 }
 
@@ -314,7 +263,7 @@ async function fetchWorkspaceFileContent(url: string, signal?: AbortSignal): Pro
  * and re-reading them only chases a storage key the relay's last save already replaced.
  */
 export function useWorkspaceFileContent(
-  workspaceId: string,
+  workspaceId: string | undefined,
   fileId: string,
   key: string,
   raw?: boolean,
@@ -324,9 +273,12 @@ export function useWorkspaceFileContent(
   }
 ): WorkspaceFileContentResult {
   const source = useFileContentSource()
-  const recoverStaleKey = useStaleKeyRecovery(workspaceId)
+  const ownerQuery = resolveFileQueryOwner(source.owner, workspaceId)
+  const recoverStaleKey = useStaleKeyRecovery({ workspaceId, fileId })
   const query = useQuery({
-    queryKey: workspaceFilesKeys.content(workspaceId, fileId, raw ? 'raw' : 'text', key),
+    queryKey:
+      ownerQuery?.adapter.contentKey(ownerQuery.id, fileId, raw ? 'raw' : 'text', key) ??
+      workspaceFilesKeys.content('', fileId, raw ? 'raw' : 'text', key),
     queryFn: async ({ signal }) => {
       try {
         return await fetchWorkspaceFileContent(source.buildUrl(key, { raw, bust: true }), signal)
@@ -335,7 +287,7 @@ export function useWorkspaceFileContent(
         throw error
       }
     },
-    enabled: !!workspaceId && !!fileId && !!key,
+    enabled: Boolean(ownerQuery) && !!fileId && !!key,
     staleTime: WORKSPACE_FILE_CONTENT_STALE_TIME,
     retry: (failureCount, error) => failureCount < 1 && !(error instanceof FileTextSizeError),
     refetchOnWindowFocus: options?.refetchOnWindowFocus === false ? false : 'always',
@@ -343,7 +295,12 @@ export function useWorkspaceFileContent(
   })
   return {
     data: query.data,
-    ...useStaleKeyRecoveryState(workspaceId, query.isLoading, query.error),
+    ...useStaleKeyRecoveryState({
+      workspaceId,
+      fileId,
+      isLoading: query.isLoading,
+      error: query.error,
+    }),
   }
 }
 
@@ -355,6 +312,13 @@ export interface WorkspaceFileContentResult {
   error: Error | null
 }
 
+interface UseStaleKeyRecoveryStateProps {
+  workspaceId: string | undefined
+  fileId: string
+  isLoading: boolean
+  error: unknown
+}
+
 /**
  * Present a superseded storage key as STILL LOADING rather than as a failure.
  *
@@ -368,13 +332,18 @@ export interface WorkspaceFileContentResult {
  * record hands back the same key — the object is genuinely gone, not moved — the recovery ends, the
  * error surfaces, and the reader sees a real failure.
  */
-function useStaleKeyRecoveryState(
-  workspaceId: string,
-  isLoading: boolean,
-  error: unknown
-): { isLoading: boolean; error: Error | null } {
+function useStaleKeyRecoveryState({
+  workspaceId,
+  fileId,
+  isLoading,
+  error,
+}: UseStaleKeyRecoveryStateProps): { isLoading: boolean; error: Error | null } {
+  const source = useFileContentSource()
+  const ownerQuery = resolveFileQueryOwner(source.owner, workspaceId)
   const resolvingRecord = useIsFetching({
-    queryKey: workspaceFilesKeys.workspaceLists(workspaceId),
+    ...(ownerQuery?.adapter.recordFilter(ownerQuery.id, fileId) ?? {
+      queryKey: workspaceFilesKeys.workspaceLists(''),
+    }),
   })
   const recovering = error instanceof StaleStorageKeyError && resolvingRecord > 0
   return {
@@ -434,18 +403,18 @@ async function fetchWorkspaceFileBinary(
  * the current content rather than a stale cached entry.
  */
 export function useWorkspaceFileBinary(
-  workspaceId: string,
+  workspaceId: string | undefined,
   fileId: string,
   key: string,
   options?: { enabled?: boolean; version?: string | number }
 ) {
   const source = useFileContentSource()
-  const recoverStaleKey = useStaleKeyRecovery(workspaceId)
+  const ownerQuery = resolveFileQueryOwner(source.owner, workspaceId)
+  const recoverStaleKey = useStaleKeyRecovery({ workspaceId, fileId })
   return useQuery({
     queryKey:
-      options?.version != null
-        ? [...workspaceFilesKeys.content(workspaceId, fileId, 'binary', key), options.version]
-        : workspaceFilesKeys.content(workspaceId, fileId, 'binary', key),
+      ownerQuery?.adapter.contentKey(ownerQuery.id, fileId, 'binary', key, options?.version) ??
+      workspaceFilesKeys.content('', fileId, 'binary', key),
     queryFn: async ({ signal }) => {
       try {
         return await fetchWorkspaceFileBinary(
@@ -462,7 +431,7 @@ export function useWorkspaceFileBinary(
     // content) so we don't 409-poll the serve route for a generated doc whose
     // compiled artifact hasn't been written yet — the doc is fetched once, when
     // it's actually ready, instead of hammering the serve URL through generation.
-    enabled: !!workspaceId && !!fileId && !!key && (options?.enabled ?? true),
+    enabled: Boolean(ownerQuery) && !!fileId && !!key && (options?.enabled ?? true),
     staleTime: WORKSPACE_FILE_BINARY_STALE_TIME,
     refetchOnWindowFocus: 'always',
     placeholderData: keepPreviousData,
@@ -574,6 +543,7 @@ export function useUploadWorkspaceFile() {
       }
     },
     onError: (error, variables) => {
+      if (error.name === 'AbortError' || variables.signal?.aborted) return
       logger.error('Failed to upload file:', error)
       if (!variables.skipToast) {
         toast.error(`Failed to upload "${variables.file.name}": ${error.message}`, {
@@ -613,7 +583,8 @@ export function useCreateWorkspaceFile() {
  * Update workspace file content mutation
  */
 interface UpdateFileContentParams extends UpdateWorkspaceFileContentBody {
-  workspaceId: string
+  owner?: EditableFileOwner
+  workspaceId: string | undefined
   fileId: string
 }
 
@@ -622,20 +593,17 @@ export function useUpdateWorkspaceFileContent() {
 
   return useMutation({
     retry: false,
-    mutationFn: async ({ workspaceId, fileId, ...body }: UpdateFileContentParams) => {
-      return requestJson(updateWorkspaceFileContentContract, {
-        params: { id: workspaceId, fileId },
-        body,
-      })
+    mutationFn: async ({ workspaceId, owner, fileId, ...body }: UpdateFileContentParams) => {
+      const queryOwner = resolveFileQueryOwner(owner, workspaceId)
+      if (!queryOwner) throw new Error('File owner is required')
+      return queryOwner.adapter.updateContent(queryOwner.id, fileId, body)
     },
     /** A lost response may follow a committed write; reconcile bytes and versions even after transport errors. */
     onSettled: (_data, _error, variables) => {
-      queryClient.invalidateQueries({
-        queryKey: workspaceFilesKeys.contentFile(variables.workspaceId, variables.fileId),
-      })
-      queryClient.invalidateQueries({
-        queryKey: workspaceFilesKeys.workspaceLists(variables.workspaceId),
-      })
+      const queryOwner = resolveFileQueryOwner(variables.owner, variables.workspaceId)
+      if (!queryOwner) return
+      for (const filter of queryOwner.adapter.invalidationFilters(queryOwner.id, variables.fileId))
+        queryClient.invalidateQueries(filter)
       queryClient.invalidateQueries({ queryKey: workspaceFilesKeys.storageInfo() })
     },
     onError: (error) => {
@@ -651,23 +619,25 @@ export function useReloadWorkspaceFileContent() {
   return useMutation({
     mutationFn: async ({
       workspaceId,
+      owner,
       fileId,
       raw,
     }: {
-      workspaceId: string
+      owner?: EditableFileOwner
+      workspaceId: string | undefined
       fileId: string
       raw: boolean
     }) => {
-      await queryClient.cancelQueries({ queryKey: workspaceFilesKeys.workspaceLists(workspaceId) })
-      const files = await queryClient.fetchQuery({
-        ...getWorkspaceFilesQueryOptions(workspaceId),
-        staleTime: 0,
-      })
-      const file = files.find((record) => record.id === fileId)
-      if (!file) throw new Error('File no longer exists')
-      if (!file.contentUpdatedAt) throw new Error('The latest file version is unavailable')
+      const queryOwner = resolveFileQueryOwner(owner, workspaceId)
+      if (!queryOwner) throw new Error('File owner is required')
+      const file = await queryOwner.adapter.reloadRecord(queryClient, queryOwner.id, fileId)
       const content = await queryClient.fetchQuery({
-        queryKey: workspaceFilesKeys.content(workspaceId, fileId, raw ? 'raw' : 'text', file.key),
+        queryKey: queryOwner.adapter.contentKey(
+          queryOwner.id,
+          fileId,
+          raw ? 'raw' : 'text',
+          file.key
+        ),
         queryFn: ({ signal }) =>
           fetchWorkspaceFileContent(source.buildUrl(file.key, { raw, bust: true }), signal),
         staleTime: 0,
diff --git a/apps/sim/hooks/use-file-content-source.tsx b/apps/sim/hooks/use-file-content-source.tsx
index 7180bfce7d6..aef4345b2f5 100644
--- a/apps/sim/hooks/use-file-content-source.tsx
+++ b/apps/sim/hooks/use-file-content-source.tsx
@@ -6,7 +6,11 @@ import {
   resolveEmbeddedFileRef,
   storedFileId,
 } from '@/lib/uploads/utils/embedded-image-ref'
-import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner, FileOwner } from '@/lib/workspace-files/ownership'
 
 export interface FileContentUrlOptions {
   /** Request the uncompiled source instead of the rendered/compiled bytes. */
@@ -126,6 +130,52 @@ export function createWorkspaceFileContentSource(
   }
 }
 
+/** Authenticated Project bytes and embeds retain their explicit owner independently of navigation. */
+function createProjectFileContentSource(projectId: string, fileId: string): FileContentSource {
+  const base = `/api/projects/${encodeURIComponent(projectId)}/files`
+  return {
+    owner: { entityType: 'project', entityId: projectId },
+    ...inlineImageSource(
+      (_key, opts) => {
+        const params = new URLSearchParams()
+        if (opts?.preview && !opts.raw) params.set('preview', '1')
+        if (opts?.version != null) params.set('v', String(opts.version))
+        else if (opts?.bust) params.set('t', String(Date.now()))
+        const query = params.toString()
+        return `${base}/${encodeURIComponent(fileId)}/${opts?.raw ? 'content' : 'artifact'}${query ? `?${query}` : ''}`
+      },
+      `${base}/inline`,
+      { entityType: 'project', entityId: projectId }
+    ),
+  }
+}
+
+interface OwnedContentSourceOptions {
+  imageDimensions?: ImageDimensionsSource
+  storageContext?: 'workspace' | 'mothership'
+}
+
+type ContentSourceAdapter = (
+  ownerId: string,
+  fileId: string,
+  options?: OwnedContentSourceOptions
+) => FileContentSource
+
+const FILE_CONTENT_ADAPTERS: FileOwnerAdapters<ContentSourceAdapter> = {
+  workspace: (id, _fileId, options) =>
+    createWorkspaceFileContentSource(id, options?.imageDimensions, options?.storageContext),
+  project: (id, fileId) => createProjectFileContentSource(id, fileId),
+}
+
+/** Authenticated owner dispatch is separate from bearer-token sources. */
+export function createOwnedFileContentSource(
+  owner: FileOwner,
+  fileId: string,
+  options?: OwnedContentSourceOptions
+): FileContentSource {
+  return requireFileOwnerAdapter(FILE_CONTENT_ADAPTERS, owner)(owner.entityId, fileId, options)
+}
+
 /**
  * Public share source. Direct file bytes come from the token content URL; embedded images route through
  * `/api/files/public/{token}/inline`, which serves them only when referenced by the shared document and
diff --git a/apps/sim/hooks/use-file-list-room.test.tsx b/apps/sim/hooks/use-file-list-room.test.tsx
new file mode 100644
index 00000000000..17e94b672c7
--- /dev/null
+++ b/apps/sim/hooks/use-file-list-room.test.tsx
@@ -0,0 +1,63 @@
+/** @vitest-environment jsdom */
+
+import { act } from 'react'
+import { QueryClient, QueryClientProvider, QueryObserver } from '@tanstack/react-query'
+import { createRoot } from 'react-dom/client'
+import { expect, it, vi } from 'vitest'
+
+const room = vi.hoisted(() => ({ changed: undefined as (() => void) | undefined }))
+vi.mock('@/hooks/use-invalidation-room', () => ({
+  useInvalidationRoom: ({ onChanged: changed }: { onChanged: () => void }) => {
+    room.changed = changed
+  },
+}))
+
+import { workspaceFileTableKeys } from '@/hooks/queries/utils/file-table-keys'
+import { useFileListRoom } from '@/hooks/use-file-list-room'
+
+function RoomProbe() {
+  useFileListRoom({ owner: { entityType: 'project', entityId: 'changed-project' } })
+  return null
+}
+
+it('refreshes open CSV previews after a Project room change without refetching another Project', async () => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
+  const client = new QueryClient({
+    defaultOptions: { queries: { retry: false, staleTime: Number.POSITIVE_INFINITY } },
+  })
+  const currentKey = workspaceFileTableKeys.projectPreview('changed-project', 'file', 'key')
+  const otherKey = workspaceFileTableKeys.projectPreview('other-project', 'file', 'key')
+  const current = new QueryObserver(client, {
+    queryKey: currentKey,
+    queryFn: async () => 'updated',
+  })
+  const other = new QueryObserver(client, {
+    queryKey: otherKey,
+    queryFn: async () => 'changed unexpectedly',
+  })
+  client.setQueryData(currentKey, 'original')
+  client.setQueryData(otherKey, 'other original')
+  const unsubscribeCurrent = current.subscribe(() => {})
+  const unsubscribeOther = other.subscribe(() => {})
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const root = createRoot(container)
+  try {
+    act(() =>
+      root.render(
+        <QueryClientProvider client={client}>
+          <RoomProbe />
+        </QueryClientProvider>
+      )
+    )
+    act(() => room.changed?.())
+    await vi.waitFor(() => expect(client.getQueryData(currentKey)).toBe('updated'))
+    expect(client.getQueryData(otherKey)).toBe('other original')
+  } finally {
+    act(() => root.unmount())
+    container.remove()
+    unsubscribeCurrent()
+    unsubscribeOther()
+    client.clear()
+  }
+})
diff --git a/apps/sim/hooks/use-file-list-room.ts b/apps/sim/hooks/use-file-list-room.ts
new file mode 100644
index 00000000000..cf6d3494ec8
--- /dev/null
+++ b/apps/sim/hooks/use-file-list-room.ts
@@ -0,0 +1,95 @@
+'use client'
+
+import { type InvalidationRoomType, ROOM_TYPES } from '@sim/realtime-protocol/rooms'
+import { type QueryClient, useQueryClient } from '@tanstack/react-query'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
+import { dashboardKeys } from '@/hooks/queries/dashboards'
+import { fileCopyKeys } from '@/hooks/queries/file-copy'
+import { fileHistoryKeys } from '@/hooks/queries/file-history'
+import { getFileShareQueryAdapter } from '@/hooks/queries/utils/file-share-query-adapters'
+import { workspaceFileTableKeys } from '@/hooks/queries/utils/file-table-keys'
+import { projectFilesKeys } from '@/hooks/queries/utils/project-file-keys'
+import {
+  invalidateWorkspaceFileBrowsers,
+  WORKSPACE_FILE_BROWSER_INVALIDATION_KEY,
+} from '@/hooks/queries/workspace-file-folders'
+import { useInvalidationRoom } from '@/hooks/use-invalidation-room'
+
+interface FileListRoomAdapter {
+  roomType: InvalidationRoomType
+  dedupeKey: string
+  refreshOnJoin?: boolean
+  invalidate: (queryClient: QueryClient, ownerId: string) => void
+  deny?: (queryClient: QueryClient, ownerId: string) => Promise<void>
+}
+
+const FILE_LIST_ROOMS = {
+  workspace: {
+    roomType: ROOM_TYPES.WORKSPACE_FILES,
+    dedupeKey: WORKSPACE_FILE_BROWSER_INVALIDATION_KEY,
+    invalidate(queryClient, workspaceId) {
+      invalidateWorkspaceFileBrowsers(queryClient, workspaceId)
+      void queryClient.invalidateQueries({
+        queryKey: fileCopyKeys.destination({ entityType: 'workspace', entityId: workspaceId }),
+      })
+      void queryClient.invalidateQueries({ queryKey: dashboardKeys.workspace(workspaceId) })
+    },
+  },
+  project: {
+    roomType: ROOM_TYPES.PROJECT_FILES,
+    dedupeKey: 'project-file-browser',
+    refreshOnJoin: true,
+    invalidate(queryClient, projectId) {
+      const owner = { entityType: 'project', entityId: projectId } as const
+      for (const queryKey of [
+        projectFilesKeys.project(projectId),
+        workspaceFileTableKeys.projectPreviews(projectId),
+        fileCopyKeys.destination(owner),
+        fileHistoryKeys.owner(owner),
+        getFileShareQueryAdapter(owner).ownerKey(projectId),
+      ])
+        void queryClient.invalidateQueries({ queryKey })
+    },
+    async deny(queryClient, projectId) {
+      const owner = { entityType: 'project', entityId: projectId } as const
+      const keys = [
+        fileCopyKeys.destination(owner),
+        fileHistoryKeys.owner(owner),
+        projectFilesKeys.project(projectId),
+        workspaceFileTableKeys.projectPreviews(projectId),
+        getFileShareQueryAdapter(owner).ownerKey(projectId),
+      ]
+      await Promise.all(keys.map((queryKey) => queryClient.cancelQueries({ queryKey })))
+      // Reset notifies mounted observers too, so revoked rows disappear before the fresh HTTP denial.
+      await Promise.all(keys.map((queryKey) => queryClient.resetQueries({ queryKey })))
+    },
+  },
+} satisfies FileOwnerAdapters<FileListRoomAdapter>
+
+interface UseFileListRoomProps {
+  owner: EditableFileOwner | null
+}
+
+/** Invalidates the explicit owner's list pages and clears Project data when current access is lost. */
+export function useFileListRoom({ owner }: UseFileListRoomProps): void {
+  const queryClient = useQueryClient()
+  const adapter = owner
+    ? requireFileOwnerAdapter<FileListRoomAdapter>(FILE_LIST_ROOMS, owner)
+    : null
+  useInvalidationRoom({
+    ownerId: owner?.entityId ?? '',
+    roomType: adapter?.roomType ?? null,
+    onChanged: () => {
+      if (owner) adapter?.invalidate(queryClient, owner.entityId)
+    },
+    dedupeKey: adapter?.dedupeKey,
+    refreshOnJoin: adapter?.refreshOnJoin,
+    onAccessDenied: () => {
+      if (owner) void adapter?.deny?.(queryClient, owner.entityId)
+    },
+  })
+}
diff --git a/apps/sim/hooks/use-invalidation-room.ts b/apps/sim/hooks/use-invalidation-room.ts
new file mode 100644
index 00000000000..70e7edf10c6
--- /dev/null
+++ b/apps/sim/hooks/use-invalidation-room.ts
@@ -0,0 +1,199 @@
+'use client'
+
+import { useEffect, useRef } from 'react'
+import { createLogger } from '@sim/logger'
+import {
+  ROOM_ACCESS_REVOKED_EVENT,
+  type RoomAccessRevokedBroadcast,
+} from '@sim/realtime-protocol/events'
+import { invalidationRoomIdKey, type RoomType } from '@sim/realtime-protocol/rooms'
+import { toRecord } from '@sim/utils/object'
+import type { Socket } from 'socket.io-client'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
+
+const logger = createLogger('InvalidationRoom')
+const MAX_JOIN_RETRIES = 3
+const JOIN_RETRY_BASE_MS = 1000
+
+interface RoomCallbacks {
+  changed: () => void
+  denied?: () => void
+  refreshOnJoin?: boolean
+}
+
+interface SharedRoomSubscription {
+  callbacks: Map<string | symbol, Set<RoomCallbacks>>
+  isDenied: () => boolean
+  dispose: () => void
+}
+
+interface UseInvalidationRoomProps {
+  ownerId: string
+  roomType: RoomType | null
+  onChanged: () => void
+  dedupeKey?: string
+  onAccessDenied?: () => void
+  refreshOnJoin?: boolean
+}
+
+const subscriptionsBySocket = new WeakMap<Socket, Map<string, SharedRoomSubscription>>()
+
+function createSharedRoomSubscription(
+  socket: Socket,
+  ownerId: string,
+  roomType: RoomType
+): SharedRoomSubscription {
+  const idKey = invalidationRoomIdKey(roomType)
+  const target = { [idKey]: ownerId }
+  const joinEvent = `join-${roomType}`
+  const successEvent = `${joinEvent}-success`
+  const errorEvent = `${joinEvent}-error`
+  const leaveEvent = `leave-${roomType}`
+  const changedEvent = `${roomType}-changed`
+  const callbacks = new Map<string | symbol, Set<RoomCallbacks>>()
+  let retries = 0
+  let denied = false
+  let retryTimer: ReturnType<typeof setTimeout> | null = null
+
+  const cancelRetry = () => {
+    if (retryTimer) clearTimeout(retryTimer)
+    retryTimer = null
+  }
+  const notify = (event: 'changed' | 'joined' | 'denied') => {
+    for (const group of callbacks.values()) {
+      for (const callback of group) {
+        if (event === 'denied') callback.denied?.()
+        else if (event === 'changed' || callback.refreshOnJoin) {
+          callback.changed()
+          break
+        }
+      }
+    }
+  }
+  const deny = () => {
+    cancelRetry()
+    denied = true
+    notify('denied')
+  }
+  const join = () => {
+    if (!denied) socket.emit(joinEvent, target)
+  }
+  const handleConnect = () => {
+    denied = false
+    retries = 0
+    cancelRetry()
+    join()
+  }
+  const handleJoinSuccess = (payload: unknown) => {
+    if (toRecord(payload)[idKey] !== ownerId || denied) return
+    retries = 0
+    cancelRetry()
+    notify('joined')
+  }
+  const handleJoinError = (payload: unknown) => {
+    const data = toRecord(payload)
+    if (data[idKey] !== ownerId) return
+    logger.warn(`Failed to join ${roomType} room`, { code: data.code, error: data.error })
+    cancelRetry()
+    if (
+      data.code === 'ACCESS_DENIED' ||
+      data.code === 'NOT_FOUND' ||
+      data.code === 'AUTHENTICATION_REQUIRED'
+    ) {
+      deny()
+      return
+    }
+    if (denied || !data.retryable || retries >= MAX_JOIN_RETRIES) return
+    retries += 1
+    retryTimer = setTimeout(join, JOIN_RETRY_BASE_MS * retries)
+  }
+  const handleChanged = (payload: unknown) => {
+    if (toRecord(payload)[idKey] !== ownerId || denied) return
+    notify('changed')
+  }
+  const handleRevoked = (payload: RoomAccessRevokedBroadcast) => {
+    if (payload.room.type !== roomType || payload.room.id !== ownerId) return
+    deny()
+  }
+
+  if (socket.connected) join()
+  socket.on('connect', handleConnect)
+  socket.on(successEvent, handleJoinSuccess)
+  socket.on(errorEvent, handleJoinError)
+  socket.on(changedEvent, handleChanged)
+  socket.on(ROOM_ACCESS_REVOKED_EVENT, handleRevoked)
+
+  return {
+    callbacks,
+    isDenied: () => denied,
+    dispose: () => {
+      cancelRetry()
+      socket.off('connect', handleConnect)
+      socket.off(successEvent, handleJoinSuccess)
+      socket.off(errorEvent, handleJoinError)
+      socket.off(changedEvent, handleChanged)
+      socket.off(ROOM_ACCESS_REVOKED_EVENT, handleRevoked)
+      socket.emit(leaveEvent, target)
+    },
+  }
+}
+
+/** Shares presence-free subscriptions while preserving each owner's wire identity and query cache. */
+export function useInvalidationRoom({
+  ownerId,
+  roomType,
+  onChanged,
+  dedupeKey,
+  onAccessDenied,
+  refreshOnJoin,
+}: UseInvalidationRoomProps): void {
+  const { socket } = useSocket()
+  const callbacksRef = useRef({
+    ownerId,
+    roomType,
+    onChanged,
+    onAccessDenied,
+  })
+  callbacksRef.current = { ownerId, roomType, onChanged, onAccessDenied }
+  const privateCallbackKeyRef = useRef(Symbol('invalidation-callback'))
+
+  useEffect(() => {
+    if (!socket || !ownerId || !roomType) return
+    const subscriberKey = `${roomType}|${ownerId}`
+    let socketSubscriptions = subscriptionsBySocket.get(socket)
+    if (!socketSubscriptions) {
+      socketSubscriptions = new Map()
+      subscriptionsBySocket.set(socket, socketSubscriptions)
+    }
+    let subscription = socketSubscriptions.get(subscriberKey)
+    if (!subscription) {
+      subscription = createSharedRoomSubscription(socket, ownerId, roomType)
+      socketSubscriptions.set(subscriberKey, subscription)
+    }
+
+    const callbackKey = dedupeKey ?? privateCallbackKeyRef.current
+    const boundCallbacks = callbacksRef.current
+    const currentCallbacks = () =>
+      callbacksRef.current.ownerId === ownerId && callbacksRef.current.roomType === roomType
+        ? callbacksRef.current
+        : boundCallbacks
+    const callback: RoomCallbacks = {
+      changed: () => currentCallbacks().onChanged(),
+      denied: () => currentCallbacks().onAccessDenied?.(),
+      refreshOnJoin,
+    }
+    const callbackGroup = subscription.callbacks.get(callbackKey) ?? new Set<RoomCallbacks>()
+    callbackGroup.add(callback)
+    subscription.callbacks.set(callbackKey, callbackGroup)
+    if (subscription.isDenied()) callback.denied?.()
+
+    return () => {
+      callbackGroup.delete(callback)
+      if (callbackGroup.size === 0) subscription.callbacks.delete(callbackKey)
+      if (subscription.callbacks.size > 0) return
+      subscription.dispose()
+      socketSubscriptions.delete(subscriberKey)
+      if (socketSubscriptions.size === 0) subscriptionsBySocket.delete(socket)
+    }
+  }, [dedupeKey, refreshOnJoin, socket, ownerId, roomType])
+}
diff --git a/apps/sim/lib/api/contracts/copilot.ts b/apps/sim/lib/api/contracts/copilot.ts
index ec3057c5a43..a050a8e5c65 100644
--- a/apps/sim/lib/api/contracts/copilot.ts
+++ b/apps/sim/lib/api/contracts/copilot.ts
@@ -1,7 +1,10 @@
 import { z } from 'zod'
 import { persistedContentBlockSchema } from '@/lib/api/contracts/copilot-messages'
 import { workspaceSearchFiltersSchema } from '@/lib/api/contracts/knowledge/search'
-import { mothershipResourceSchema } from '@/lib/api/contracts/mothership-resources'
+import {
+  mothershipResourceRemovalSchema,
+  mothershipResourceSchema,
+} from '@/lib/api/contracts/mothership-resources'
 import { requiredFieldSchema, workspaceIdSchema } from '@/lib/api/contracts/primitives'
 import { usageUpgradePayloadSchema } from '@/lib/api/contracts/subscription'
 import { type ContractJsonResponse, defineRouteContract } from '@/lib/api/contracts/types'
@@ -120,11 +123,8 @@ export const addCopilotChatResourceBodySchema = z
   })
 export type AddCopilotChatResourceBody = z.input<typeof addCopilotChatResourceBodySchema>
 
-export const removeCopilotChatResourceBodySchema = z.object({
-  workspaceId: workspaceIdSchema.optional(),
+export const removeCopilotChatResourceBodySchema = mothershipResourceRemovalSchema.safeExtend({
   chatId: z.string(),
-  resourceType: mothershipResourceSchema.shape.type,
-  resourceId: z.string(),
 })
 export type RemoveCopilotChatResourceBody = z.input<typeof removeCopilotChatResourceBodySchema>
 
diff --git a/apps/sim/lib/api/contracts/mothership-assistant-tools.ts b/apps/sim/lib/api/contracts/mothership-assistant-tools.ts
index 60a9db7177d..dbe5d53ebce 100644
--- a/apps/sim/lib/api/contracts/mothership-assistant-tools.ts
+++ b/apps/sim/lib/api/contracts/mothership-assistant-tools.ts
@@ -347,8 +347,22 @@ export const listWorkspacesInputSchema = z.object({
   cursor: z.string().uuid().optional().describe('Copy nextCursor from the preceding page.'),
 })
 
+/** Project discovery accepts pagination only; the conversation determines the accessible scope. */
+export const listUserProjectsInputSchema = z.object({
+  cursor: z.string().min(1).optional(),
+  limit: z.number().int().min(1).max(100).default(50),
+})
+export type ListUserProjectsInput = z.output<typeof listUserProjectsInputSchema>
+
 /** Executor identity belongs to Sim; model-facing profile guidance belongs to its caller. */
 export const assistantToolContracts = [
+  {
+    id: 'list_user_projects',
+    route: 'sim',
+    description:
+      'List accessible Projects within this conversation, with visible environments and current capabilities. Follow nextCursor for more results; discovery does not grant file write access.',
+    inputSchema: listUserProjectsInputSchema,
+  },
   {
     id: 'list_workspaces',
     route: 'sim',
diff --git a/apps/sim/lib/api/contracts/mothership-chats.ts b/apps/sim/lib/api/contracts/mothership-chats.ts
index 5b4574e5acd..3143c988f9f 100644
--- a/apps/sim/lib/api/contracts/mothership-chats.ts
+++ b/apps/sim/lib/api/contracts/mothership-chats.ts
@@ -1,7 +1,9 @@
 import { z } from 'zod'
 import { addCopilotChatResourceBodySchema } from '@/lib/api/contracts/copilot'
-import { mothershipResourceSchema } from '@/lib/api/contracts/mothership-resources'
-import { workspaceIdSchema } from '@/lib/api/contracts/primitives'
+import {
+  mothershipResourceRemovalSchema,
+  mothershipResourceSchema,
+} from '@/lib/api/contracts/mothership-resources'
 import { scheduleContextSchema } from '@/lib/api/contracts/schedules'
 import {
   mountedSecretNamesSchema,
@@ -243,11 +245,8 @@ const reorderMothershipChatResourcesBodySchema = z.object({
   resources: z.array(mothershipResourceSchema),
 })
 
-const removeMothershipChatResourceBodySchema = z.object({
-  workspaceId: workspaceIdSchema.optional(),
+const removeMothershipChatResourceBodySchema = mothershipResourceRemovalSchema.safeExtend({
   chatId: z.string().min(1),
-  resourceType: mothershipResourceSchema.shape.type,
-  resourceId: z.string().min(1),
 })
 
 export const addMothershipChatResourceContract = defineRouteContract({
diff --git a/apps/sim/lib/api/contracts/mothership-resource-tools.ts b/apps/sim/lib/api/contracts/mothership-resource-tools.ts
index c7187963192..6133754f44f 100644
--- a/apps/sim/lib/api/contracts/mothership-resource-tools.ts
+++ b/apps/sim/lib/api/contracts/mothership-resource-tools.ts
@@ -1,28 +1,46 @@
 import { z } from 'zod'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 
-/** Canonical resources in one selected workspace; titles come from authorized reads. */
-export const openResourceInputSchema = z.strictObject({
-  workspaceId: z
-    .string()
-    .min(1)
-    .optional()
-    .describe('Explicit owning workspace in organization chat.'),
-  resources: z
-    .array(
-      z.strictObject({
-        type: z.enum(['workflow', 'table', 'knowledgebase', 'file', 'dashboard', 'log']),
-        id: z.string().trim().min(1),
-        viewId: z
-          .string()
-          .trim()
-          .min(1)
-          .optional()
-          .describe('Saved table view; table resources only.'),
+/** Requested targets only; canonical metadata comes from authorized reads. */
+export const openResourceInputSchema = z
+  .strictObject({
+    workspaceId: z
+      .string()
+      .min(1)
+      .optional()
+      .describe('Explicit owning workspace in organization chat.'),
+    resources: z
+      .array(
+        z.strictObject({
+          type: z.enum(['workflow', 'table', 'knowledgebase', 'file', 'dashboard', 'log']),
+          id: z.string().trim().min(1),
+          owner: FileOperationOwner.optional(),
+          viewId: z
+            .string()
+            .trim()
+            .min(1)
+            .optional()
+            .describe('Saved table view; table resources only.'),
+        })
+      )
+      .min(1)
+      .max(20),
+  })
+  .superRefine((input, ctx) => {
+    const projects = input.resources.filter((resource) => resource.owner?.entityType === 'project')
+    if (input.resources.some((resource) => resource.owner && resource.type !== 'file'))
+      ctx.addIssue({
+        code: 'custom',
+        path: ['resources'],
+        message: 'Explicit file owners apply only to files',
       })
-    )
-    .min(1)
-    .max(20),
-})
+    if (projects.length && (projects.length !== input.resources.length || input.workspaceId))
+      ctx.addIssue({
+        code: 'custom',
+        path: ['resources'],
+        message: 'Project files cannot be mixed with workspace targets',
+      })
+  })
 export const openResourceOutputSchema = z.object({
   resources: z.array(
     z.object({
@@ -31,6 +49,7 @@ export const openResourceOutputSchema = z.object({
       title: z.string(),
       viewId: z.string().optional(),
       executionId: z.string().optional(),
+      owner: FileOperationOwner.optional(),
     })
   ),
 })
diff --git a/apps/sim/lib/api/contracts/mothership-resources.ts b/apps/sim/lib/api/contracts/mothership-resources.ts
index 65c9add4770..6a7997f83ad 100644
--- a/apps/sim/lib/api/contracts/mothership-resources.ts
+++ b/apps/sim/lib/api/contracts/mothership-resources.ts
@@ -3,6 +3,7 @@ import { requiredFieldSchema, workspaceIdSchema } from '@/lib/api/contracts/prim
 import { predicateInputSchema, sortSpecSchema } from '@/lib/api/contracts/tables'
 import { ResourceAddress, SearchResource } from '@/lib/mothership/generated/resources'
 import {
+  hasValidChatResourceOwner,
   type MothershipResource,
   MothershipResourceType,
   PERSISTED_RESOURCE_TYPES,
@@ -13,6 +14,7 @@ const resourceAddressSchema = z
   .object({
     type: z.enum(PERSISTED_RESOURCE_TYPES),
     id: requiredFieldSchema('resource.id cannot be empty'),
+    owner: ResourceAddress.shape.owner,
     workspaceId: workspaceIdSchema.optional(),
     workspaceName: z.string().max(256).optional(),
     path: z.string().optional(),
@@ -22,6 +24,12 @@ const resourceAddressSchema = z
     sources: ResourceAddress.shape.sources,
   })
   .superRefine((resource, ctx) => {
+    if (!hasValidChatResourceOwner(resource))
+      ctx.addIssue({
+        code: 'custom',
+        path: ['owner'],
+        message: 'Resource owner conflicts with its address',
+      })
     if ((resource.type === 'sources') !== (resource.sources !== undefined))
       ctx.addIssue({
         code: 'custom',
@@ -56,6 +64,23 @@ export const mothershipResourceSchema = resourceAddressSchema.safeExtend({
   title: z.string(),
 }) satisfies z.ZodType<MothershipResource>
 
+/** Removal uses the same file owner constraints as resource creation and hydration. */
+export const mothershipResourceRemovalSchema = z
+  .object({
+    owner: ResourceAddress.shape.owner,
+    workspaceId: workspaceIdSchema.optional(),
+    resourceType: z.enum(PERSISTED_RESOURCE_TYPES),
+    resourceId: requiredFieldSchema('resourceId cannot be empty'),
+  })
+  .superRefine((resource, ctx) => {
+    if (!hasValidChatResourceOwner({ ...resource, type: resource.resourceType }))
+      ctx.addIssue({
+        code: 'custom',
+        path: ['owner'],
+        message: 'Resource owner conflicts with its address',
+      })
+  })
+
 /** The query visible in an embedded table, including changes not saved yet. */
 export const mothershipTableViewContextSchema = z
   .object({
diff --git a/apps/sim/lib/api/contracts/public-shares.ts b/apps/sim/lib/api/contracts/public-shares.ts
index 4fd88574d3b..a843412d713 100644
--- a/apps/sim/lib/api/contracts/public-shares.ts
+++ b/apps/sim/lib/api/contracts/public-shares.ts
@@ -65,6 +65,8 @@ const getFileShareResponseSchema = z.object({
   share: shareRecordSchema.nullable(),
 })
 
+export type GetFileShareResponse = z.output<typeof getFileShareResponseSchema>
+
 export const getFileShareContract = defineRouteContract({
   method: 'GET',
   path: '/api/workspaces/[id]/files/[fileId]/share',
diff --git a/apps/sim/lib/api/contracts/workspace-file-versions.ts b/apps/sim/lib/api/contracts/workspace-file-versions.ts
index 98b1f258bd7..490dea3616b 100644
--- a/apps/sim/lib/api/contracts/workspace-file-versions.ts
+++ b/apps/sim/lib/api/contracts/workspace-file-versions.ts
@@ -20,9 +20,13 @@ const listWorkspaceFileVersionsResponseSchema = z.object({
   revision: writtenFileRevisionSchema,
   nextCursor: z.string().nullable(),
 })
+export type ListWorkspaceFileVersionsResponse = z.output<
+  typeof listWorkspaceFileVersionsResponseSchema
+>
 const revertWorkspaceFileVersionBodySchema = v2RevertFileVersionBodySchema
   .omit({ workspaceId: true })
   .extend({ expectedRevision: z.string().min(1).max(1024).optional() })
+export type RevertWorkspaceFileVersionBody = z.input<typeof revertWorkspaceFileVersionBodySchema>
 const revertWorkspaceFileVersionResponseSchema = z.object({
   reverted: z.boolean(),
   revision: writtenFileRevisionSchema,
diff --git a/apps/sim/lib/api/contracts/workspace-files.ts b/apps/sim/lib/api/contracts/workspace-files.ts
index 5f5b3dc1aac..22453430e7e 100644
--- a/apps/sim/lib/api/contracts/workspace-files.ts
+++ b/apps/sim/lib/api/contracts/workspace-files.ts
@@ -182,6 +182,8 @@ export const extractWorkspaceFileResponseSchema = workspaceFileSuccessSchema.ext
   skippedCount: z.number().int().nonnegative(),
 })
 
+export type ExtractWorkspaceFileResponse = z.output<typeof extractWorkspaceFileResponseSchema>
+
 export const listWorkspaceFilesContract = defineRouteContract({
   method: 'GET',
   path: '/api/workspaces/[id]/files',
diff --git a/apps/sim/lib/api/server/routes/copilot-project-file-request.test.ts b/apps/sim/lib/api/server/routes/copilot-project-file-request.test.ts
new file mode 100644
index 00000000000..23ac3f8df19
--- /dev/null
+++ b/apps/sim/lib/api/server/routes/copilot-project-file-request.test.ts
@@ -0,0 +1,154 @@
+import { describe, expect, it } from 'vitest'
+import {
+  copilotRequestPrincipal,
+  isCopilotRequest,
+  markCopilotProjectFileRequest,
+} from '@/lib/api/server/routes/copilot-request'
+import { requireResourceDelegation } from '@/lib/core/application/resource-delegation'
+import {
+  type CopilotExecutionContext,
+  createCopilotResourceAdmission,
+} from '@/lib/mothership/auth/application-delegation'
+import { getProjectFileMetadata, listProjectFiles } from '@/lib/projects/files/application'
+import { projectFileOperations } from '@/lib/projects/files/application/operations'
+import { listAllWorkspaceFiles } from '@/lib/workspace-files/application/list-workspace-files'
+
+function authoringContext(): CopilotExecutionContext {
+  return {
+    userId: 'actor',
+    chatId: 'private-chat',
+    toolCallId: 'tool-call',
+    copilotToolExecution: true,
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId: 'actor',
+      invocation: { kind: 'chat', chatId: 'private-chat' },
+    }),
+  }
+}
+
+function request() {
+  return new Request('https://sim.test/api/v2/projects/project/files/file/metadata', {
+    headers: {
+      'x-mothership-project-id': 'project',
+      'x-mothership-user-id': 'actor',
+      'x-api-key': 'mothership-in-process',
+    },
+  })
+}
+
+describe('private v2 Project file authority', () => {
+  it('retains the admitted human and exact target without a workspace delegation', () => {
+    const req = request()
+    const context = authoringContext()
+    const target = { projectId: 'project', fileId: 'file' }
+    markCopilotProjectFileRequest(req, context, target)
+    context.userId = 'later-user'
+    target.projectId = 'later-project'
+    const principal = copilotRequestPrincipal(
+      req,
+      projectFileOperations.readMetadata,
+      getProjectFileMetadata
+    )
+    if (!principal) throw new Error('The admitted Project file request lost its principal')
+    expect(principal).toMatchObject({
+      kind: 'resource_delegated',
+      subjectUserId: 'actor',
+      invocation: { kind: 'chat', chatId: 'private-chat' },
+      scope: { kind: 'entity', entityType: 'project', entityId: 'project', fileId: 'file' },
+    })
+    expect(principal).not.toHaveProperty('workspaceId')
+    expect(
+      requireResourceDelegation(principal, {
+        audience: 'sim:project-files',
+        services: ['copilot'],
+        scope: { kind: 'entity', entityType: 'project', entityId: 'project', fileId: 'file' },
+        maxTtlMs: 60_000,
+      })
+    ).toBe('actor')
+  })
+
+  it('does not transfer private admission through headers or a cloned Request', () => {
+    const req = request()
+    expect(isCopilotRequest(req)).toBe(false)
+    expect(
+      copilotRequestPrincipal(req, projectFileOperations.readMetadata, getProjectFileMetadata)
+    ).toBeUndefined()
+    markCopilotProjectFileRequest(req, authoringContext(), { projectId: 'project', fileId: 'file' })
+    const cloned = new Request(req)
+    expect(isCopilotRequest(cloned)).toBe(false)
+    expect(
+      copilotRequestPrincipal(cloned, projectFileOperations.readMetadata, getProjectFileMetadata)
+    ).toBeUndefined()
+  })
+
+  it.each([
+    ['missing evidence', { copilotResourceAdmission: undefined }],
+    ['changed subject', { userId: 'another-user' }],
+    ['changed chat', { chatId: 'another-chat' }],
+    ['workflow execution', { boundWorkflowExecutionId: 'workflow-run' }],
+    ['executor origin', { executorDelegationOrigin: {} }],
+    ['Mothership block', { mcpBlockId: 'block' }],
+  ] as const)('rejects %s before marking the request', (_name, changes) => {
+    const req = request()
+    expect(() =>
+      markCopilotProjectFileRequest(
+        req,
+        { ...authoringContext(), ...changes },
+        { projectId: 'project' }
+      )
+    ).toThrow('Copilot resource operations require current authoring admission')
+    expect(isCopilotRequest(req)).toBe(false)
+  })
+
+  it('rejects a serialized admission even when its actor and target fields match', () => {
+    const context = authoringContext()
+    context.copilotResourceAdmission = structuredClone(context.copilotResourceAdmission)
+    expect(() =>
+      markCopilotProjectFileRequest(request(), context, { projectId: 'project' })
+    ).toThrow('Copilot resource operations require current authoring admission')
+  })
+
+  it('never changes a file-bound request into collection or workspace authority', () => {
+    const req = request()
+    markCopilotProjectFileRequest(req, authoringContext(), { projectId: 'project', fileId: 'file' })
+    expect(
+      copilotRequestPrincipal(req, projectFileOperations.list, listProjectFiles)
+    ).toBeUndefined()
+    expect(
+      copilotRequestPrincipal(req, listAllWorkspaceFiles.operation, listAllWorkspaceFiles)
+    ).toBeUndefined()
+    const collection = request()
+    markCopilotProjectFileRequest(collection, authoringContext(), { projectId: 'project' })
+    expect(
+      copilotRequestPrincipal(collection, projectFileOperations.list, listProjectFiles)
+    ).toMatchObject({
+      scope: { kind: 'entity', entityType: 'project', entityId: 'project' },
+    })
+    expect(
+      copilotRequestPrincipal(
+        collection,
+        projectFileOperations.readMetadata,
+        getProjectFileMetadata
+      )
+    ).toBeUndefined()
+  })
+
+  it('rejects unregistered operation identities and mismatched use-case policies', () => {
+    const req = request()
+    markCopilotProjectFileRequest(req, authoringContext(), { projectId: 'project', fileId: 'file' })
+    const clone = { ...projectFileOperations.readMetadata }
+    expect(
+      copilotRequestPrincipal(req, clone, { ...getProjectFileMetadata, operation: clone })
+    ).toBeUndefined()
+    expect(
+      copilotRequestPrincipal(req, projectFileOperations.readMetadata, listProjectFiles)
+    ).toBeUndefined()
+    expect(
+      copilotRequestPrincipal(req, projectFileOperations.readMetadata, {
+        ...getProjectFileMetadata,
+        delegationAudience: 'sim:other',
+      })
+    ).toBeUndefined()
+    expect(copilotRequestPrincipal(req, projectFileOperations.readMetadata)).toBeUndefined()
+  })
+})
diff --git a/apps/sim/lib/api/server/routes/copilot-request.ts b/apps/sim/lib/api/server/routes/copilot-request.ts
index 5408444aa48..ad7fabb3ff5 100644
--- a/apps/sim/lib/api/server/routes/copilot-request.ts
+++ b/apps/sim/lib/api/server/routes/copilot-request.ts
@@ -1,19 +1,78 @@
-import type { DelegatedPrincipal } from '@sim/auth/principal'
+import type { DelegatedPrincipal, ResourceDelegatedPrincipal } from '@sim/auth/principal'
 import { markCopilotWorkspaceInvocation } from '@/lib/core/application/copilot-workspace-invocation'
 import type { ApplicationOperation, OperationUseCase } from '@/lib/core/application/operation'
 import {
   type CopilotChatDelegationContext,
+  type CopilotExecutionContext,
   createCopilotChatPrincipal,
+  createCopilotResourceApplicationPrincipal,
+  requireTrustedCopilotResourceExecutionContext,
+  type TrustedCopilotResourceExecutionContext,
 } from '@/lib/mothership/auth/application-delegation'
+import type { ProjectFileTarget } from '@/lib/projects/files/application/authorization'
+import {
+  PROJECT_FILE_DELEGATION_TTL_MS,
+  projectFileOperations,
+} from '@/lib/projects/files/application/operations'
+import type { CopyFileItemsInput } from '@/lib/workspace-files/application/copy-authorization'
+import {
+  FILE_COPY_DELEGATION_TTL_MS,
+  fileCopyOperation,
+} from '@/lib/workspace-files/application/copy-operation'
+
+type CopilotRequestInvocation =
+  | { kind: 'file_copy'; principal: ResourceDelegatedPrincipal }
+  | { kind: 'workspace'; context: Readonly<CopilotChatDelegationContext> }
+  | {
+      kind: 'project_files'
+      context: TrustedCopilotResourceExecutionContext
+      target: Readonly<ProjectFileTarget>
+    }
 
 /** A private in-process invocation, installed only after current chat/target authorization. Never a wire header. */
-const INVOCATIONS = new WeakMap<Request, Readonly<CopilotChatDelegationContext>>()
+const INVOCATIONS = new WeakMap<Request, CopilotRequestInvocation>()
 
 export function markCopilotRequest(
   request: Request,
   invocation: CopilotChatDelegationContext
 ): void {
-  INVOCATIONS.set(request, Object.freeze({ ...invocation }))
+  INVOCATIONS.set(request, { kind: 'workspace', context: Object.freeze({ ...invocation }) })
+}
+
+/** Binds one precise Project request to opaque authoring admission; the use case reauthorizes current access. */
+export function markCopilotProjectFileRequest(
+  request: Request,
+  context: CopilotExecutionContext,
+  target: ProjectFileTarget
+): void {
+  const trustedContext = requireTrustedCopilotResourceExecutionContext(context)
+  if (!target.projectId.trim() || (target.fileId !== undefined && !target.fileId.trim())) {
+    throw new Error('Copilot Project file requests require a valid resource target')
+  }
+  INVOCATIONS.set(request, {
+    kind: 'project_files',
+    context: trustedContext,
+    target: Object.freeze({ ...target }),
+  })
+}
+
+/** Carries one immutable paired grant to the registered compound operation without a wire credential. */
+export function markCopilotFileCopyRequest(
+  request: Request,
+  context: CopilotExecutionContext,
+  target: CopyFileItemsInput
+): ResourceDelegatedPrincipal {
+  const principal = createCopilotResourceApplicationPrincipal(
+    requireTrustedCopilotResourceExecutionContext(context),
+    {
+      audience: fileCopyOperation.delegationAudience,
+      ttlMs: FILE_COPY_DELEGATION_TTL_MS,
+      createDelegationId: (trusted) => trusted.toolCallId,
+      scope: { kind: 'file_copy', ...target },
+    }
+  )
+  INVOCATIONS.set(request, { kind: 'file_copy', principal })
+  return principal
 }
 
 export function isCopilotRequest(request: Request): boolean {
@@ -28,11 +87,40 @@ export function copilotRequestPrincipal(
     OperationUseCase<ApplicationOperation, unknown, unknown>,
     'operation' | 'delegationAudience'
   >
-): DelegatedPrincipal | undefined {
+): DelegatedPrincipal | ResourceDelegatedPrincipal | undefined {
   const invocation = INVOCATIONS.get(request)
   if (!invocation) return undefined
   if (useCase?.operation !== operation || !useCase.delegationAudience) return undefined
-  const principal = createCopilotChatPrincipal(invocation, useCase.delegationAudience)
+  if (invocation.kind === 'file_copy') {
+    return operation === fileCopyOperation &&
+      useCase.delegationAudience === fileCopyOperation.delegationAudience
+      ? invocation.principal
+      : undefined
+  }
+  if (invocation.kind === 'project_files') {
+    const registered = Object.values(projectFileOperations).find((entry) => entry === operation)
+    if (
+      !registered ||
+      !registered.principalKinds.some((kind) => kind === 'resource_delegated') ||
+      !registered.delegatedServices.some((service) => service === 'copilot') ||
+      registered.delegationAudience !== useCase.delegationAudience ||
+      (registered.target === 'file') !== (invocation.target.fileId !== undefined)
+    ) {
+      return undefined
+    }
+    return createCopilotResourceApplicationPrincipal(invocation.context, {
+      audience: registered.delegationAudience,
+      ttlMs: PROJECT_FILE_DELEGATION_TTL_MS,
+      createDelegationId: (context) => context.toolCallId,
+      scope: {
+        kind: 'entity',
+        entityType: 'project',
+        entityId: invocation.target.projectId,
+        ...(invocation.target.fileId ? { fileId: invocation.target.fileId } : {}),
+      },
+    })
+  }
+  const principal = createCopilotChatPrincipal(invocation.context, useCase.delegationAudience)
   markCopilotWorkspaceInvocation(principal)
   return principal
 }
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 f6ccc0bb5e6..6f434d53e2d 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
@@ -13,7 +13,8 @@ export async function observePrivateFile(
     buffer: Buffer
     name: string
     path: string
-    source: 'sandbox' | 'upload' | 'knowledge'
+    source: 'sandbox' | 'upload' | 'knowledge' | 'project'
+    fileId?: string
     contentType?: string
     knowledge?: {
       documentId: string
@@ -24,7 +25,7 @@ export async function observePrivateFile(
     }
   },
   flags: AgentCliFlags,
-  options: { offset?: number; limit?: number },
+  options: { offset?: number; limit?: number; visual?: boolean },
   signal?: AbortSignal
 ) {
   const type = file.contentType ?? getMimeTypeFromExtension(getFileExtension(file.name))
@@ -33,10 +34,11 @@ export async function observePrivateFile(
     path: file.path,
     type,
     source: file.source,
+    ...(file.fileId ? { fileId: file.fileId } : {}),
     ...file.knowledge,
   }
   const textRange = options.offset !== undefined || options.limit !== undefined
-  const visual = flags.render !== undefined || flags.pages !== undefined
+  const visual = options.visual || flags.render !== undefined || flags.pages !== undefined
   if (visual || (!textRange && (type.startsWith('image/') || type === 'application/pdf'))) {
     const decoded = await decodeFileVisual({
       buffer: file.buffer,
@@ -60,6 +62,7 @@ export async function observePrivateFile(
       observations: [
         {
           name: file.name,
+          ...(file.fileId ? { resourceId: file.fileId } : {}),
           mediaType: decoded.mediaType,
           data: decoded.buffer.toString('base64'),
           ...(decoded.pages ? { pageCount: decoded.pages.last - decoded.pages.first + 1 } : {}),
@@ -100,9 +103,11 @@ export async function observePrivateFile(
       bytes: file.buffer.length,
       contentAvailable: false,
       note:
-        file.source === 'knowledge'
-          ? 'Content was not inspected: this original has no model-readable decoder.'
-          : 'Content was not inspected: this file has no model-readable decoder. Process its mounted sandbox path with run_code.',
+        file.source === 'project'
+          ? 'Content was not inspected: this file has no model-readable decoder. Download its stored bytes to inspect it.'
+          : file.source === 'knowledge'
+            ? 'Content was not inspected: this original has no model-readable decoder.'
+            : 'Content was not inspected: this file has no model-readable decoder. Process its mounted sandbox path with run_code.',
     })
   )
 }
diff --git a/apps/sim/lib/mothership/agent-cli/engines/universal-grep.ts b/apps/sim/lib/mothership/agent-cli/engines/universal-grep.ts
index d4496a4f677..159698d1904 100644
--- a/apps/sim/lib/mothership/agent-cli/engines/universal-grep.ts
+++ b/apps/sim/lib/mothership/agent-cli/engines/universal-grep.ts
@@ -46,9 +46,9 @@ const MAX_LINE_CHARS = 2_000
 const FETCH_CONCURRENCY = 8
 /** Past any catalog's size: the use case builds the full list in memory and slices it. */
 const CATALOG_ALL = 100_000
-const MAX_FILES = 300
+export const MAX_GREP_FILES = 300
 const FILE_READ_CONCURRENCY = 5
-const MAX_BYTES_PER_FILE = 262_144
+export const MAX_GREP_BYTES_PER_FILE = 262_144
 /** Bound scanning after materialization without charging backend read latency. */
 const MAX_SCAN_TIME_MS = 5_000
 const SCAN_YIELD_INTERVAL_MS = 10
@@ -68,7 +68,10 @@ const NESTED_REQUEST_CONCURRENCY = 8
 let activeRequests = 0
 const waiting: Array<() => void> = []
 
-async function gated<T>(work: () => Promise<T>, signal?: AbortSignal): Promise<T> {
+export async function withGrepReadSlot<T>(
+  work: () => Promise<T>,
+  signal?: AbortSignal
+): Promise<T> {
   signal?.throwIfAborted()
   if (activeRequests >= NESTED_REQUEST_CONCURRENCY) {
     await new Promise<void>((resolve, reject) => {
@@ -102,12 +105,12 @@ function gatedRuntime(runtime: GrepRuntime): GrepRuntime {
     ...runtime,
     client: {
       request: (path, options) =>
-        gated(() => runtime.client.request(path, options), runtime.signal),
+        withGrepReadSlot(() => runtime.client.request(path, options), runtime.signal),
     },
   }
 }
 
-interface Materialized {
+export interface GrepMaterialized {
   scope: Scope
   /** Display identity: the resource's name when it has one, else its id. */
   label: string
@@ -142,6 +145,11 @@ async function listAll(runtime: GrepRuntime, path: string): Promise<Record<strin
   return out
 }
 
+/** File adapters share bounded reads and wait for every provenance import before returning. */
+export function mapGrepFileReads<T, R>(items: T[], read: (item: T) => Promise<R>): Promise<R[]> {
+  return mapConcurrent(items, FILE_READ_CONCURRENCY, read)
+}
+
 async function mapConcurrent<T, R>(
   items: T[],
   limit: number,
@@ -173,7 +181,7 @@ async function settleAll<T>(tasks: Promise<T>[]): Promise<T[]> {
  * The searchable text leads with the resource's own name and description: a workflow's
  * state carries neither, so `grep fx-` in an `fx-*` workspace found nothing.
  */
-function render(scope: Scope, id: string, label: string, value: unknown): Materialized {
+function render(scope: Scope, id: string, label: string, value: unknown): GrepMaterialized {
   const description =
     isRecordLike(value) && typeof (value as Record<string, unknown>).description === 'string'
       ? (value as Record<string, unknown>).description
@@ -223,7 +231,7 @@ const INDEXERS: Record<Scope, (runtime: GrepRuntime) => Promise<IndexEntry[]>> =
     // runs answers in one call, same authorization, same projection.
     if (runtime.principal) {
       const principal = enginePrincipal(runtime, listCatalogTools)!
-      const page = await gated(
+      const page = await withGrepReadSlot(
         () =>
           listCatalogTools.execute({
             principal,
@@ -285,7 +293,10 @@ const INDEXERS: Record<Scope, (runtime: GrepRuntime) => Promise<IndexEntry[]>> =
 }
 
 /** One fetch per scope; a null text preserves the identity of an unreadable resource. */
-const FETCHERS: Record<Scope, (runtime: GrepRuntime, item: IndexEntry) => Promise<Materialized>> = {
+const FETCHERS: Record<
+  Scope,
+  (runtime: GrepRuntime, item: IndexEntry) => Promise<GrepMaterialized>
+> = {
   workflows: async (runtime, item) => {
     // The draft state, not the export: export is sanitized for sharing and nulls
     // workspace-specific fields (a Table block's `tableId`), so a grep for a table id
@@ -314,7 +325,7 @@ const FETCHERS: Record<Scope, (runtime: GrepRuntime, item: IndexEntry) => Promis
     try {
       const response = await runtime.client.request<ReadFileTextResponse>(
         `/api/v2/files/${encodeURIComponent(item.id)}/text`,
-        { query: { workspaceId: runtime.workspaceId, maxBytes: String(MAX_BYTES_PER_FILE) } }
+        { query: { workspaceId: runtime.workspaceId, maxBytes: String(MAX_GREP_BYTES_PER_FILE) } }
       )
       if (response.data.degraded || response.data.truncated) {
         runtime.reportIncomplete(
@@ -358,21 +369,21 @@ async function fetchAll(
   runtime: GrepRuntime,
   scope: Scope,
   entries: IndexEntry[]
-): Promise<Materialized[]> {
-  if (scope === 'files' && entries.length > MAX_FILES) {
+): Promise<GrepMaterialized[]> {
+  if (scope === 'files' && entries.length > MAX_GREP_FILES) {
     runtime.reportIncomplete(
-      `files: searched the first ${MAX_FILES} of ${entries.length} selected files; narrow with --in files/<name-or-id>.`
+      `files: searched the first ${MAX_GREP_FILES} of ${entries.length} selected files; narrow with --in files/<name-or-id>.`
     )
   }
-  const selected = scope === 'files' ? entries.slice(0, MAX_FILES) : entries
+  const selected = scope === 'files' ? entries.slice(0, MAX_GREP_FILES) : entries
   return mapConcurrent(selected, concurrencyFor(scope), (item) => FETCHERS[scope](runtime, item))
 }
 
 /** A whole world, for a search with no `--in`: every resource the index lists. */
-async function materializeScope(runtime: GrepRuntime, scope: Scope): Promise<Materialized[]> {
+async function materializeScope(runtime: GrepRuntime, scope: Scope): Promise<GrepMaterialized[]> {
   if (scope === 'blocks' && runtime.principal) {
     const principal = enginePrincipal(runtime, readBlockCatalog)!
-    const { blocks } = await gated(
+    const { blocks } = await withGrepReadSlot(
       () =>
         readBlockCatalog.execute({
           principal,
@@ -399,10 +410,10 @@ async function materializeWithin(
   runtime: GrepRuntime,
   scopes: Scope[],
   nameFilter: string
-): Promise<Materialized[]> {
+): Promise<GrepMaterialized[]> {
   // Cheapest platform world first: a block id answers from 65 definitions, and only a
   // miss there pays for the tool catalog's 5,000 entries.
-  const platform: Materialized[] = []
+  const platform: GrepMaterialized[] = []
   for (const scope of scopes.filter((scope) => PLATFORM_SCOPES.has(scope))) {
     const corpus = await materializeScope(runtime, scope)
     const exact = corpus.filter((m) => m.id.toLowerCase() === nameFilter)
@@ -506,134 +517,162 @@ function parseContext(flags: AgentCliFlags): ContextWindow | string {
   return { before: before ?? around ?? 0, after: after ?? around ?? 0 }
 }
 
-export const universalGrepCommand: AgentCliEngine = {
-  async execute(positionals, runtime, flags) {
-    const pattern = positionals[0]
-    if (!pattern) {
-      return agentCliFail(
-        'Usage: sim grep <pattern> [--scope workflows,blocks,...] [--in <world|id|name|world/id>] [-i] [-C n] [-A n] [-B n] [--count] [--limit n]'
-      )
-    }
-    const scopes = parseScopes(flags)
-    if (typeof scopes === 'string') return agentCliFail(scopes)
-    const limit = parseLimit(flags)
-    if (typeof limit === 'string') return agentCliFail(limit)
-    const context = parseContext(flags)
-    if (typeof context === 'string') return agentCliFail(context)
-    const ignoreCase = flags.i === true
-    const countOnly = flags.count === true
-    // `--in tables` reads as "search the tables world", so a world name narrows the scope;
-    // `--in blocks/table_v2` is the path a match line prints (world, then resource); a bare
-    // value is a resource id or name inside the searched worlds.
-    const within = typeof flags.in === 'string' ? flags.in : undefined
-    const [withinHead, ...withinRest] = within ? within.toLowerCase().split('/') : []
-    if (within && withinHead && KNOWLEDGE_SELECTOR_HEADS.has(withinHead)) {
-      return agentCliFail(knowledgeWithin(within))
-    }
-    const withinScope = SCOPES.find((scope) => scope === withinHead)
-    const withinResource = withinScope ? withinRest.join('/') : within?.toLowerCase()
-    const searched: Scope[] = withinScope ? [withinScope] : scopes
-    const nameFilter = withinResource || undefined
-    /**
-     * Refused before any fetch: the model learns the accepted forms without paying for
-     * a full materialization it would only get an empty result from.
-     */
-    if (within && nameFilter && PREFIX_SELECTOR.test(nameFilter)) {
-      return agentCliFail(unknownWithin(within))
-    }
-    const matches = compilePattern(pattern, ignoreCase)
-    const issues: string[] = []
-    let issueCount = 0
-    const bounded = gatedRuntime({
-      ...runtime,
-      reportIncomplete: (message) => {
-        issueCount++
-        if (issues.length < 10) issues.push(clip(message))
-      },
-    })
-    const finish = (stdout: string) =>
-      issueCount === 0
-        ? agentCliOk(stdout)
-        : {
-            exitCode: 1,
-            stdout,
-            stderr: `Search incomplete (${issueCount} issue${issueCount === 1 ? '' : 's'}); matches and counts cover only the content read.\n${issues.join('\n')}${issueCount > issues.length ? `\n${issueCount - issues.length} further issues omitted.` : ''}`,
-          }
-    const candidates = nameFilter
-      ? await materializeWithin(bounded, searched, nameFilter)
-      : (await settleAll(searched.map((scope) => materializeScope(bounded, scope)))).flat()
-    runtime.signal?.throwIfAborted()
-    /**
-     * A resource nothing in the searched worlds answers to is a wrong selector, not a
-     * search with no hits — a silent "No matches" would hide the misspelling.
-     */
-    if (within && nameFilter && candidates.length === 0) {
-      return issueCount ? finish('') : agentCliFail(unknownWithin(within))
-    }
+export interface GrepSource {
+  signal?: AbortSignal
+  allowedScopes?: readonly Scope[]
+  materialize(
+    scopes: Scope[],
+    nameFilter: string | undefined,
+    reportIncomplete: (message: string) => void
+  ): Promise<GrepMaterialized[]>
+}
 
-    const out: string[] = []
-    let total = 0
-    let shownMatches = 0
-    const perScope = new Map<Scope, number>()
-    const scanStartedAt = performance.now()
-    let lastYieldAt = scanStartedAt
-    const checkScan = () => {
-      runtime.signal?.throwIfAborted()
-      const now = performance.now()
-      if (now - scanStartedAt >= MAX_SCAN_TIME_MS) {
-        throw new Error(
-          'Search incomplete: scanning exceeded the time budget. Narrow with --scope or --in.'
-        )
-      }
-      return now
-    }
-    for (const resource of candidates) {
-      if (resource.text === null) continue
-      const lines = resource.text.split('\n')
-      const selected = new Map<number, boolean>()
-      const remainingLines = limit - out.length
-      let nextContextLine = 0
-      for (let i = 0; i < lines.length; i++) {
-        if (checkScan() - lastYieldAt >= SCAN_YIELD_INTERVAL_MS) {
-          await sleep(0)
-          lastYieldAt = checkScan()
-        }
-        if (!matches(lines[i])) continue
-        total++
-        perScope.set(resource.scope, (perScope.get(resource.scope) ?? 0) + 1)
-        if (countOnly) continue
-        for (
-          let j = Math.max(nextContextLine, i - context.before);
-          j <= Math.min(lines.length - 1, i + context.after) && selected.size < remainingLines;
-          j++
-        ) {
-          selected.set(j, false)
-          nextContextLine = j + 1
+/** Shared bounded matching over a corpus authorized by its owner-specific source. */
+export async function executeGrep(positionals: string[], flags: AgentCliFlags, source: GrepSource) {
+  const pattern = positionals[0]
+  if (!pattern) {
+    return agentCliFail(
+      'Usage: sim grep <pattern> [--scope workflows,blocks,...] [--in <world|id|name|world/id>] [-i] [-C n] [-A n] [-B n] [--count] [--limit n]'
+    )
+  }
+  const scopes = parseScopes(flags)
+  if (typeof scopes === 'string') return agentCliFail(scopes)
+  const limit = parseLimit(flags)
+  if (typeof limit === 'string') return agentCliFail(limit)
+  const context = parseContext(flags)
+  if (typeof context === 'string') return agentCliFail(context)
+  const ignoreCase = flags.i === true
+  const countOnly = flags.count === true
+  // `--in tables` reads as "search the tables world", so a world name narrows the scope;
+  // `--in blocks/table_v2` is the path a match line prints (world, then resource); a bare
+  // value is a resource id or name inside the searched worlds.
+  const within = typeof flags.in === 'string' ? flags.in : undefined
+  const [withinHead, ...withinRest] = within ? within.toLowerCase().split('/') : []
+  if (within && withinHead && KNOWLEDGE_SELECTOR_HEADS.has(withinHead)) {
+    return agentCliFail(knowledgeWithin(within))
+  }
+  const withinScope = SCOPES.find((scope) => scope === withinHead)
+  const withinResource = withinScope ? withinRest.join('/') : within?.toLowerCase()
+  const searched: Scope[] = withinScope ? [withinScope] : scopes
+  const allowedScopes = source.allowedScopes
+  if (
+    allowedScopes &&
+    (scopes.length === 0 ||
+      scopes.some((scope) => !allowedScopes.includes(scope)) ||
+      searched.some((scope) => !allowedScopes.includes(scope)))
+  ) {
+    return agentCliFail(
+      'Project grep supports only --scope files. Search workspace resources separately.'
+    )
+  }
+  const nameFilter = withinResource || undefined
+  /**
+   * Refused before any fetch: the model learns the accepted forms without paying for
+   * a full materialization it would only get an empty result from.
+   */
+  if (within && nameFilter && PREFIX_SELECTOR.test(nameFilter)) {
+    return agentCliFail(unknownWithin(within))
+  }
+  const matches = compilePattern(pattern, ignoreCase)
+  const issues: string[] = []
+  let issueCount = 0
+  const reportIncomplete = (message: string) => {
+    issueCount++
+    if (issues.length < 10) issues.push(clip(message))
+  }
+  const finish = (stdout: string) =>
+    issueCount === 0
+      ? agentCliOk(stdout)
+      : {
+          exitCode: 1,
+          stdout,
+          stderr: `Search incomplete (${issueCount} issue${issueCount === 1 ? '' : 's'}); matches and counts cover only the content read.\n${issues.join('\n')}${issueCount > issues.length ? `\n${issueCount - issues.length} further issues omitted.` : ''}`,
         }
-        if (selected.has(i)) selected.set(i, true)
+  const candidates = await source.materialize(searched, nameFilter, reportIncomplete)
+  source.signal?.throwIfAborted()
+  /**
+   * A resource nothing in the searched worlds answers to is a wrong selector, not a
+   * search with no hits — a silent "No matches" would hide the misspelling.
+   */
+  if (within && nameFilter && candidates.length === 0) {
+    return issueCount ? finish('') : agentCliFail(unknownWithin(within))
+  }
+
+  const out: string[] = []
+  let total = 0
+  let shownMatches = 0
+  const perScope = new Map<Scope, number>()
+  const scanStartedAt = performance.now()
+  let lastYieldAt = scanStartedAt
+  const checkScan = () => {
+    source.signal?.throwIfAborted()
+    const now = performance.now()
+    if (now - scanStartedAt >= MAX_SCAN_TIME_MS) {
+      throw new Error(
+        'Search incomplete: scanning exceeded the time budget. Narrow with --scope or --in.'
+      )
+    }
+    return now
+  }
+  for (const resource of candidates) {
+    if (resource.text === null) continue
+    const lines = resource.text.split('\n')
+    const selected = new Map<number, boolean>()
+    const remainingLines = limit - out.length
+    let nextContextLine = 0
+    for (let i = 0; i < lines.length; i++) {
+      if (checkScan() - lastYieldAt >= SCAN_YIELD_INTERVAL_MS) {
+        await sleep(0)
+        lastYieldAt = checkScan()
       }
-      if (countOnly || selected.size === 0 || out.length >= limit) continue
-      const header = `${resource.scope}/${resource.label}${resource.label === resource.id ? '' : ` (${resource.id})`}`
-      for (const [i, isMatch] of selected) {
-        out.push(`${header}:${i + 1}: ${clip(lines[i])}`)
-        if (isMatch) shownMatches++
+      if (!matches(lines[i])) continue
+      total++
+      perScope.set(resource.scope, (perScope.get(resource.scope) ?? 0) + 1)
+      if (countOnly) continue
+      for (
+        let j = Math.max(nextContextLine, i - context.before);
+        j <= Math.min(lines.length - 1, i + context.after) && selected.size < remainingLines;
+        j++
+      ) {
+        selected.set(j, false)
+        nextContextLine = j + 1
       }
+      if (selected.has(i)) selected.set(i, true)
     }
-    checkScan()
-
-    if (countOnly) {
-      const breakdown = [...perScope.entries()].map(([s, n]) => `${s}=${n}`).join(' ')
-      return finish(`${total}${breakdown ? ` (${breakdown})` : ''}`)
+    if (countOnly || selected.size === 0 || out.length >= limit) continue
+    const header = `${resource.scope}/${resource.label}${resource.label === resource.id ? '' : ` (${resource.id})`}`
+    for (const [i, isMatch] of selected) {
+      out.push(`${header}:${i + 1}: ${clip(lines[i])}`)
+      if (isMatch) shownMatches++
     }
-    if (out.length === 0) {
-      return finish(
-        `No matches for ${JSON.stringify(pattern)} in ${searched.join(', ')}${nameFilter ? ` within "${nameFilter}"` : ''}.`
-      )
-    }
-    const truncated =
-      total > shownMatches
-        ? `\n[${shownMatches} of ${total} matching lines shown — narrow with --scope, --in, or a tighter pattern]`
-        : ''
-    return finish(out.join('\n') + truncated)
-  },
+  }
+  checkScan()
+
+  if (countOnly) {
+    const breakdown = [...perScope.entries()].map(([s, n]) => `${s}=${n}`).join(' ')
+    return finish(`${total}${breakdown ? ` (${breakdown})` : ''}`)
+  }
+  if (out.length === 0) {
+    return finish(
+      `No matches for ${JSON.stringify(pattern)} in ${searched.join(', ')}${nameFilter ? ` within "${nameFilter}"` : ''}.`
+    )
+  }
+  const truncated =
+    total > shownMatches
+      ? `\n[${shownMatches} of ${total} matching lines shown — narrow with --scope, --in, or a tighter pattern]`
+      : ''
+  return finish(out.join('\n') + truncated)
+}
+
+export const universalGrepCommand: AgentCliEngine = {
+  execute: (positionals, runtime, flags) =>
+    executeGrep(positionals, flags, {
+      signal: runtime.signal,
+      async materialize(scopes, nameFilter, reportIncomplete) {
+        const bounded = gatedRuntime({ ...runtime, reportIncomplete })
+        return nameFilter
+          ? materializeWithin(bounded, scopes, nameFilter)
+          : (await settleAll(scopes.map((scope) => materializeScope(bounded, scope)))).flat()
+      },
+    }),
 }
diff --git a/apps/sim/lib/mothership/agent-cli/execute.ts b/apps/sim/lib/mothership/agent-cli/execute.ts
new file mode 100644
index 00000000000..ab036b9abbd
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/execute.ts
@@ -0,0 +1,55 @@
+import type { EmbeddedCliIdentity } from 'sim/embed'
+import { runCli } from '@/lib/mothership/agent-cli/run-cli'
+import { applySink } from '@/lib/mothership/agent-cli/sink'
+import type { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
+import type {
+  AgentCliAugmentationInvocation,
+  AgentCliRawResult,
+  AgentCliRequest,
+} from '@/lib/mothership/generated/agent-cli'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import { TraceSpan } from '@/lib/mothership/generated/trace-spans-v1'
+import { withCopilotSpan } from '@/lib/mothership/request/otel'
+
+interface PreparedCliInvocation {
+  identity: EmbeddedCliIdentity
+  sessionKey: string | null
+  files?: ReturnType<typeof createWorkbenchFileProvenance>
+  resources: ResourceChange[]
+  augment(invocation: AgentCliAugmentationInvocation): Promise<AgentCliRawResult>
+  curate?(result: AgentCliRawResult): Promise<AgentCliRawResult>
+  projectResources?(resources: ResourceChange[]): ResourceChange[]
+}
+
+/** Owner adapters prepare authority and transport; every invocation shares execution and result delivery. */
+export async function executePreparedCliRequest(
+  request: AgentCliRequest,
+  prepared: PreparedCliInvocation
+): Promise<AgentCliRawResult> {
+  const { identity, sessionKey, files, resources } = prepared
+  const { invocation, sink } = request
+  identity.signal?.throwIfAborted()
+  let result: AgentCliRawResult
+  if (invocation.kind === 'stdout') {
+    result = { exitCode: 0, stdout: invocation.stdout, stderr: '' }
+  } else if (invocation.kind === 'service') {
+    throw new Error('Service invocation must use the service bridge')
+  } else {
+    result = await withCopilotSpan(TraceSpan.CopilotCliInvoke, undefined, () =>
+      invocation.kind === 'augmentation'
+        ? prepared.augment(invocation)
+        : runCli(invocation.argv, identity, sessionKey, files)
+    )
+    if (invocation.kind === 'cli' && prepared.curate) result = await prepared.curate(result)
+  }
+  if (resources.length)
+    result = { ...result, resources: [...resources, ...(result.resources ?? [])] }
+  if (result.resources?.length && prepared.projectResources) {
+    result = { ...result, resources: prepared.projectResources(result.resources) }
+  }
+  return sink
+    ? withCopilotSpan(TraceSpan.CopilotCliSink, undefined, () =>
+        applySink(sink, sessionKey, result, identity.signal, files?.observeOutput)
+      )
+    : result
+}
diff --git a/apps/sim/lib/mothership/agent-cli/file-copy-transport.ts b/apps/sim/lib/mothership/agent-cli/file-copy-transport.ts
new file mode 100644
index 00000000000..19efe071059
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/file-copy-transport.ts
@@ -0,0 +1,53 @@
+import { NextRequest } from 'next/server'
+import { fileCopyInputSchema } from '@/lib/api/contracts/file-copy-input'
+import { v2CopyFileItemsContract } from '@/lib/api/contracts/v2/file-copy'
+import { markCopilotFileCopyRequest } from '@/lib/api/server/routes/copilot-request'
+import { V2_PARSE_DEFAULTS, v2InvalidBodyResponse } from '@/lib/api/server/routes/v2-json-route'
+import { parseRequest } from '@/lib/api/server/validation'
+import { requireResourceDelegation } from '@/lib/core/application/resource-delegation'
+import { createScopedCliTransport } from '@/lib/mothership/agent-cli/scoped-transport'
+import type { CopilotExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import type { CopyFileItemsInput } from '@/lib/workspace-files/application/copy-authorization'
+import {
+  FILE_COPY_DELEGATION_TTL_MS,
+  fileCopyOperation,
+} from '@/lib/workspace-files/application/copy-operation'
+import { v2Error } from '@/app/api/v2/lib/response'
+
+/** Binds the native request body to one paired capability; the application rechecks both current owners. */
+export function createFileCopyCliTransport(
+  endpoint: string,
+  context: CopilotExecutionContext,
+  target: CopyFileItemsInput
+): typeof fetch {
+  const bound = fileCopyInputSchema.parse(target)
+  return createScopedCliTransport(endpoint, {
+    async admitRequest(request, route) {
+      if (route.pattern !== v2CopyFileItemsContract.path || request.method !== 'POST') {
+        return v2Error('BAD_REQUEST', 'CLI target is unavailable')
+      }
+      const parsed = await parseRequest(
+        v2CopyFileItemsContract,
+        new NextRequest(request.clone()),
+        {},
+        {
+          ...V2_PARSE_DEFAULTS,
+          invalidJsonResponse: () => v2InvalidBodyResponse(request),
+        }
+      )
+      if (!parsed.success) return parsed.response
+      request.signal.throwIfAborted()
+      try {
+        const principal = markCopilotFileCopyRequest(request, context, bound)
+        requireResourceDelegation(principal, {
+          audience: fileCopyOperation.delegationAudience,
+          services: fileCopyOperation.delegatedServices,
+          scope: { kind: 'file_copy', ...parsed.data.body },
+          maxTtlMs: FILE_COPY_DELEGATION_TTL_MS,
+        })
+      } catch {
+        return v2Error('FORBIDDEN', 'File copy authority is unavailable')
+      }
+    },
+  })
+}
diff --git a/apps/sim/lib/mothership/agent-cli/file-copy.ts b/apps/sim/lib/mothership/agent-cli/file-copy.ts
new file mode 100644
index 00000000000..b97b5b0018e
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/file-copy.ts
@@ -0,0 +1,64 @@
+import type { EmbeddedCliIdentity } from 'sim/embed'
+import { fileCopyInputSchema } from '@/lib/api/contracts/file-copy-input'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { executePreparedCliRequest } from '@/lib/mothership/agent-cli/execute'
+import { createFileCopyCliTransport } from '@/lib/mothership/agent-cli/file-copy-transport'
+import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
+import { createTracedCliTransport } from '@/lib/mothership/agent-cli/traced-transport'
+import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
+import { requireTrustedCopilotResourceExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import type { AgentCliRawResult, AgentCliRequest } from '@/lib/mothership/generated/agent-cli'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+
+/** Executes one compound copy with both explicit owners and the original authoring invocation. */
+export async function executeFileCopyCliRequest(
+  request: AgentCliRequest,
+  context: AgentCliExecutionContext
+): Promise<AgentCliRawResult> {
+  const { invocation } = request
+  if (
+    invocation.kind !== 'file-copy' ||
+    request.fileOwner !== undefined ||
+    request.workspaceId !== undefined ||
+    request.curate !== undefined
+  ) {
+    throw new OrchestrationError(
+      'validation',
+      'File copy requires one explicit source and destination'
+    )
+  }
+  const trustedContext = requireTrustedCopilotResourceExecutionContext(context)
+  const target = fileCopyInputSchema.parse({
+    source: invocation.source,
+    destination: invocation.destination,
+  })
+  const endpoint = getInternalApiBaseUrl()
+  const sessionKey = context.chatId ? chatSandboxSessionKey(context.chatId) : null
+  const files = sessionKey ? createWorkbenchFileProvenance({ ...context, sessionKey }) : undefined
+  const resources: ResourceChange[] = []
+  const identity: EmbeddedCliIdentity = {
+    endpoint,
+    apiKey: 'mothership-in-process',
+    transport: createResourceEffectTransport(
+      endpoint,
+      createTracedCliTransport(
+        endpoint,
+        createFileCopyCliTransport(endpoint, trustedContext, target)
+      ),
+      resources
+    ),
+    ...(context.signal ? { signal: context.signal } : {}),
+  }
+  return executePreparedCliRequest(request, {
+    identity,
+    sessionKey,
+    files,
+    resources,
+    async augment() {
+      throw new OrchestrationError('validation', 'File copy does not support augmentations')
+    },
+  })
+}
diff --git a/apps/sim/lib/mothership/agent-cli/index.ts b/apps/sim/lib/mothership/agent-cli/index.ts
index 324a36dd401..b20b93a0620 100644
--- a/apps/sim/lib/mothership/agent-cli/index.ts
+++ b/apps/sim/lib/mothership/agent-cli/index.ts
@@ -1,202 +1,38 @@
-import { createEmbeddedClient, type EmbeddedCliIdentity } from 'sim/embed'
-import { withWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope'
-import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
-import { curateBlockDetail } from '@/lib/mothership/agent-cli/curation'
-import { AUGMENTATION_ENGINES, runEngine } from '@/lib/mothership/agent-cli/engines'
-import { createFileReadTransport } from '@/lib/mothership/agent-cli/file-read-transport'
-import { createFileUploadTransport } from '@/lib/mothership/agent-cli/file-upload-transport'
-import { curateKnowledgeDocuments } from '@/lib/mothership/agent-cli/knowledge-curation'
-import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
-import { runCli } from '@/lib/mothership/agent-cli/run-cli'
-import { createScopedCliTransport } from '@/lib/mothership/agent-cli/scoped-transport'
+import { executeFileCopyCliRequest } from '@/lib/mothership/agent-cli/file-copy'
 import { executeAgentCliService } from '@/lib/mothership/agent-cli/services'
-import { applySink } from '@/lib/mothership/agent-cli/sink'
-import { createTableReadTransport } from '@/lib/mothership/agent-cli/table-read-transport'
-import { createTracedCliTransport } from '@/lib/mothership/agent-cli/traced-transport'
-import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
-import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
-import {
-  COPILOT_APPLICATION_DELEGATION_TTL_MS,
-  createCopilotChatPrincipal,
-  createTrustedOrganizationCopilotPrincipal,
-} from '@/lib/mothership/auth/application-delegation'
+import { executeWorkspaceCliRequest } from '@/lib/mothership/agent-cli/workspace'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
 import type { AgentCliRawResult, AgentCliRequest } from '@/lib/mothership/generated/agent-cli'
-import type { ResourceChange } from '@/lib/mothership/generated/resources'
-import { TraceSpan } from '@/lib/mothership/generated/trace-spans-v1'
-import { withCopilotSpan } from '@/lib/mothership/request/otel'
-import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
 import type { ServerToolContext } from '@/lib/mothership/tools/server/base-tool'
-import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization'
 
 export interface AgentCliExecutionContext extends Omit<ServerToolContext, 'abortSignal'> {
   signal?: AbortSignal
 }
 
-/**
- * Executes one typed request from the worker: mint the caller's delegated identity, run
- * the real CLI, named engine or service, and land the pre-parsed sink. All
- * lanes preserve the server-minted identity so "the agent is the user" holds without any
- * credential crossing to the worker. Success here means only "the invocation ran".
- */
+/** Dispatches explicit file owners through registered policy adapters; non-file commands retain their scope. */
 export async function executeAgentCliRequest(
   request: AgentCliRequest,
   context: AgentCliExecutionContext
 ): Promise<AgentCliRawResult> {
   context.signal?.throwIfAborted()
+  if (request.invocation.kind === 'file-copy') {
+    return executeFileCopyCliRequest(request, context)
+  }
+  if (request.fileOwner) {
+    const owner = Object.freeze({ ...request.fileOwner })
+    return getCopilotFileOwnerAdapter(owner).executeCli(
+      { ...request, fileOwner: owner },
+      context,
+      owner
+    )
+  }
   if (
     request.invocation.kind === 'service' ||
     (request.invocation.kind === 'stdout' &&
       request.workspaceId === undefined &&
       (context.chatOrganizationId || context.organizationId))
-  )
+  ) {
     return executeAgentCliService(request, context)
-  const target = await resolveInvocationWorkspace(context, request.workspaceId)
-  return withWorkspaceInvocationScope(
-    {
-      workspaceId: target.workspaceId,
-      organizationId: context.chatOrganizationId ?? context.organizationId,
-    },
-    () =>
-      executeBoundAgentCliRequest(request, {
-        ...context,
-        ...target,
-        chatOrganizationId: context.chatOrganizationId ?? context.organizationId,
-      })
-  )
-}
-
-async function executeBoundAgentCliRequest(
-  request: AgentCliRequest,
-  context: AgentCliExecutionContext & { workspaceId: string }
-): Promise<AgentCliRawResult> {
-  /** The embedded client's required credential is opaque and never valid on the public API. */
-  const apiKey = 'mothership-in-process'
-  const invocationIdentity = {
-    userId: context.userId,
-    workspaceId: context.workspaceId,
-    chatId: context.chatId,
-  }
-  const endpoint = getInternalApiBaseUrl()
-  const sessionKey = context.chatId ? chatSandboxSessionKey(context.chatId) : null
-  const files = sessionKey ? createWorkbenchFileProvenance({ ...context, sessionKey }) : undefined
-  const reads = createFileReadTransport({
-    endpoint,
-    transport: createTableReadTransport({
-      endpoint,
-      transport: createTracedCliTransport(
-        endpoint,
-        createScopedCliTransport(endpoint, invocationIdentity)
-      ),
-      registry: context.resolvedSecretTraceRegistry,
-    }),
-    userId: context.userId,
-    invocation: invocationIdentity,
-    registry: context.resolvedSecretTraceRegistry,
-    ...(context.chatId !== undefined ? { chatId: context.chatId } : {}),
-    ...(files ? { trackDownload: files.trackDownload } : {}),
-  })
-  const resources: ResourceChange[] = []
-  const identity: EmbeddedCliIdentity = {
-    endpoint,
-    apiKey,
-    workspaceId: context.workspaceId,
-    transport: createResourceEffectTransport(
-      endpoint,
-      files
-        ? createFileUploadTransport({
-            endpoint,
-            workspaceId: context.workspaceId,
-            userId: context.userId,
-            invocation: invocationIdentity,
-            fallback: reads,
-            uploadProvenance: files.uploadProvenance,
-          })
-        : reads,
-      resources,
-      request.invocation.kind === 'cli' ||
-        (request.invocation.kind === 'augmentation' &&
-          AUGMENTATION_ENGINES[request.invocation.name]?.openReadResources === true)
-    ),
-    ...(context.signal ? { signal: context.signal } : {}),
   }
-
-  const { invocation, sink } = request
-  let result: AgentCliRawResult
-  context.signal?.throwIfAborted()
-  if (invocation.kind === 'stdout') {
-    // Text the worker already holds (sliced, or worker-answered): only the sink applies.
-    result = { exitCode: 0, stdout: invocation.stdout, stderr: '' }
-  } else if (invocation.kind === 'augmentation') {
-    result = await withCopilotSpan(TraceSpan.CopilotCliInvoke, undefined, async () =>
-      runEngine(
-        invocation.name,
-        invocation.positionals,
-        {
-          client: createEmbeddedClient(identity),
-          workspaceId: context.workspaceId,
-          userId: context.userId,
-          principal: createCopilotChatPrincipal(
-            invocationIdentity,
-            WORKSPACE_FILES_DELEGATION_AUDIENCE
-          ),
-          invocation: invocationIdentity,
-          ...(context.chatOrganizationId && context.chatId
-            ? {
-                chatOrganizationId: context.chatOrganizationId,
-                chatPrincipal: createTrustedOrganizationCopilotPrincipal(
-                  {
-                    userId: context.userId,
-                    organizationId: context.chatOrganizationId,
-                    chatId: context.chatId,
-                    delegationId: `scratch:${context.chatId}`,
-                  },
-                  {
-                    audience: WORKSPACE_FILES_DELEGATION_AUDIENCE,
-                    ttlMs: COPILOT_APPLICATION_DELEGATION_TTL_MS,
-                  }
-                ),
-              }
-            : {}),
-          ...(context.chatId !== undefined ? { chatId: context.chatId } : {}),
-          signal: context.signal,
-        },
-        invocation.flags
-      )
-    )
-  } else if (invocation.kind === 'cli') {
-    const { argv } = invocation
-    result = await withCopilotSpan(TraceSpan.CopilotCliInvoke, undefined, () =>
-      runCli(argv, identity, sessionKey, files)
-    )
-    if (request.curate === 'knowledge-documents') result = curateKnowledgeDocuments(result)
-    if (result.exitCode === 0 && request.curate === 'block') {
-      result = await withCopilotSpan(TraceSpan.CopilotCliCurate, undefined, () =>
-        curateBlockDetail(result, context)
-      )
-    }
-  } else throw new Error('Service invocation must use the service bridge')
-  if (resources.length)
-    result = { ...result, resources: [...resources, ...(result.resources ?? [])] }
-  // Only organization chats address a workspace; a workspace chat's resources leave it implicit.
-  if (context.chatOrganizationId && result.resources?.length)
-    result = {
-      ...result,
-      resources: result.resources.map((effect) => {
-        switch (effect.op) {
-          case 'upsert':
-            return { ...effect, resource: { ...effect.resource, workspaceId: context.workspaceId } }
-          case 'remove':
-            return { ...effect, resource: { ...effect.resource, workspaceId: context.workspaceId } }
-          case 'refresh':
-            return { ...effect, resource: { ...effect.resource, workspaceId: context.workspaceId } }
-          case 'clear_view':
-            return { ...effect, resource: { ...effect.resource, workspaceId: context.workspaceId } }
-        }
-      }),
-    }
-  return sink
-    ? withCopilotSpan(TraceSpan.CopilotCliSink, undefined, () =>
-        applySink(sink, sessionKey, result, context.signal, files?.observeOutput)
-      )
-    : result
+  return executeWorkspaceCliRequest(request, context)
 }
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-grep.test.ts b/apps/sim/lib/mothership/agent-cli/project-file-grep.test.ts
new file mode 100644
index 00000000000..48c186d3cdd
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-grep.test.ts
@@ -0,0 +1,128 @@
+/** @vitest-environment node */
+
+import { flushMacrotask } from '@sim/testing/helpers/async'
+import { createDeferred } from '@sim/testing/helpers/deferred'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { list, artifact } = vi.hoisted(() => ({ list: vi.fn(), artifact: vi.fn() }))
+vi.mock('@/lib/projects/files/application', () => ({
+  listProjectFiles: { execute: list },
+  readProjectFileArtifact: { execute: artifact },
+}))
+vi.mock('@/lib/mothership/application/execute-project-file-use-case', () => ({
+  executeCopilotProjectFileUseCase: (
+    _context: unknown,
+    useCase: { execute(input: unknown): Promise<unknown> },
+    input: unknown
+  ) => useCase.execute(input),
+}))
+
+import { grepProjectFiles } from '@/lib/mothership/agent-cli/project-file-grep'
+import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const invocation = {
+  kind: 'augmentation' as const,
+  name: 'grep',
+  positionals: ['needle'],
+  flags: { scope: 'files', in: 'files/notes' },
+}
+const context = () => ({
+  userId: 'reader',
+  resolvedSecretTraceRegistry: new ResolvedSecretTraceRegistry([], { userId: 'reader' }),
+})
+beforeEach(() => {
+  list.mockResolvedValue({
+    files: [{ id: 'file', name: 'notes.txt', folderPath: '/' }],
+    nextKeys: null,
+  })
+  artifact.mockResolvedValue({
+    file: { id: 'file', name: 'notes.txt' },
+    contentType: 'text/plain',
+    buffer: Buffer.from('before\nneedle\nafter'),
+    secretProvenance: { status: 'exact', entries: [] },
+  })
+})
+
+describe('Project grep corpus', () => {
+  it('selects a file on a later inventory page and preserves matching line numbers', async () => {
+    list.mockImplementation(async ({ after }: { after?: { value: string }[] }) =>
+      after?.[0]?.value === 'cursor'
+        ? { files: [{ id: 'file', name: 'notes.txt', folderPath: '/' }], nextKeys: null }
+        : {
+            files: [{ id: 'other', name: 'unrelated.txt' }],
+            nextKeys: [{ value: 'cursor', direction: 'asc' }],
+          }
+    )
+    const result = await grepProjectFiles(invocation, context(), 'project')
+    expect(result).toEqual({ exitCode: 0, stdout: 'files/notes.txt (file):2: needle', stderr: '' })
+  })
+  it.each([{ scope: 'files,workflows' }, { scope: 'files', in: 'workflows' }, { scope: '' }])(
+    'refuses incompatible Project scope before reading a corpus: %j',
+    async (flags) => {
+      const result = await grepProjectFiles({ ...invocation, flags }, context(), 'project')
+      expect(result.exitCode).toBe(1)
+      expect(list).not.toHaveBeenCalled()
+    }
+  )
+  it('refuses to match bytes without exact source evidence', async () => {
+    artifact.mockResolvedValueOnce({
+      file: { id: 'file', name: 'notes.txt' },
+      contentType: 'text/plain',
+      buffer: Buffer.from('needle'),
+      secretProvenance: { status: 'unknown' },
+    })
+    await expect(grepProjectFiles(invocation, context(), 'project')).rejects.toThrow(
+      'secret provenance'
+    )
+  })
+  it('marks truncated inventory incomplete instead of claiming a missing selector has no matches', async () => {
+    list.mockResolvedValue({ files: [], nextKeys: [{ value: 'cursor', direction: 'asc' }] })
+    const result = await grepProjectFiles(invocation, context(), 'project')
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toContain('listing stopped after 50 pages')
+    expect(result.stdout).toBe('')
+  })
+})
+
+it('reads five Project artifacts concurrently while preserving inventory result order', async () => {
+  const gates = Array.from({ length: 6 }, () => createDeferred<void>())
+  let active = 0
+  let peak = 0
+  list.mockResolvedValue({
+    files: Array.from({ length: 6 }, (_, index) => ({
+      id: `file-${index}`,
+      name: `notes-${index}.txt`,
+      folderPath: '/',
+    })),
+    nextKeys: null,
+  })
+  artifact.mockImplementation(async ({ fileId }: { fileId: string }) => {
+    active++
+    peak = Math.max(peak, active)
+    await gates[Number(fileId.slice(5))].promise
+    active--
+    return {
+      file: { id: fileId, name: `${fileId}.txt` },
+      contentType: 'text/plain',
+      buffer: Buffer.from('needle'),
+      secretProvenance: { status: 'exact', entries: [] },
+    }
+  })
+  const pending = grepProjectFiles(invocation, context(), 'project')
+  try {
+    await flushMacrotask()
+    expect(active).toBe(5)
+    for (const index of [4, 3, 2, 1, 0, 5]) {
+      gates[index].resolve()
+      await flushMacrotask()
+    }
+  } finally {
+    for (const gate of gates) gate.resolve()
+    await pending
+  }
+  const result = await pending
+  expect(peak).toBe(5)
+  expect(result.stdout.split('\n')).toEqual(
+    Array.from({ length: 6 }, (_, index) => `files/notes-${index}.txt (file-${index}):1: needle`)
+  )
+})
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-grep.ts b/apps/sim/lib/mothership/agent-cli/project-file-grep.ts
new file mode 100644
index 00000000000..e3cee41f785
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-grep.ts
@@ -0,0 +1,125 @@
+import type { CursorKey } from '@/lib/api/list-query'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import {
+  executeGrep,
+  type GrepMaterialized,
+  MAX_GREP_BYTES_PER_FILE,
+  MAX_GREP_FILES,
+  mapGrepFileReads,
+  withGrepReadSlot,
+} from '@/lib/mothership/agent-cli/engines/universal-grep'
+import { importProjectFileProvenance } from '@/lib/mothership/agent-cli/project-file-provenance'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import type { AgentCliAugmentationInvocation } from '@/lib/mothership/generated/agent-cli'
+import { listProjectFiles, readProjectFileArtifact } from '@/lib/projects/files/application'
+import { parseWorkspaceFileText } from '@/lib/workspace-files/text-extraction'
+import { workspaceFileTextFormat } from '@/lib/workspace-files/text-format'
+
+/** Project grep materializes only freshly authorized files and imports evidence before matching. */
+export function grepProjectFiles(
+  invocation: AgentCliAugmentationInvocation,
+  context: AgentCliExecutionContext,
+  projectId: string
+) {
+  return executeGrep(invocation.positionals, invocation.flags, {
+    signal: context.signal,
+    allowedScopes: ['files'],
+    async materialize(_scopes, nameFilter, reportIncomplete) {
+      const selectedFiles: {
+        item: Awaited<ReturnType<typeof listProjectFiles.execute>>['files'][number]
+        label: string
+      }[] = []
+      const files: Awaited<ReturnType<typeof listProjectFiles.execute>>['files'] = []
+      let after: CursorKey[] | undefined
+      for (let pageNumber = 0; pageNumber < 50; pageNumber++) {
+        context.signal?.throwIfAborted()
+        const page = await withGrepReadSlot(
+          () =>
+            executeCopilotProjectFileUseCase(
+              context,
+              listProjectFiles,
+              { projectId, sortBy: 'name', sortOrder: 'asc', limit: 100, after },
+              { projectId }
+            ),
+          context.signal
+        )
+        files.push(...page.files)
+        if (!page.nextKeys) break
+        after = page.nextKeys
+        if (pageNumber === 49)
+          reportIncomplete(
+            'files: listing stopped after 50 pages; use files list to continue discovery.'
+          )
+      }
+      let selected = 0
+      for (const item of files) {
+        context.signal?.throwIfAborted()
+        const folder = (item.folderPath ?? '').replace(/^\/+|\/+$/g, '')
+        const label = folder ? `${folder}/${item.name}` : item.name
+        if (
+          nameFilter &&
+          item.id.toLowerCase() !== nameFilter &&
+          !label.toLowerCase().includes(nameFilter)
+        )
+          continue
+        if (selected++ >= MAX_GREP_FILES) {
+          reportIncomplete(
+            `files: searched the first ${MAX_GREP_FILES} selected files; narrow with --in files/<name-or-id>.`
+          )
+          break
+        }
+        selectedFiles.push({ item, label })
+      }
+      return mapGrepFileReads(selectedFiles, async ({ item, label }): Promise<GrepMaterialized> => {
+        context.signal?.throwIfAborted()
+        const target = { projectId, fileId: item.id }
+        let artifact: Awaited<ReturnType<typeof readProjectFileArtifact.execute>>
+        try {
+          artifact = await withGrepReadSlot(
+            () =>
+              executeCopilotProjectFileUseCase(
+                context,
+                readProjectFileArtifact,
+                { ...target, maxBytes: MAX_GREP_BYTES_PER_FILE },
+                target
+              ),
+            context.signal
+          )
+        } catch {
+          context.signal?.throwIfAborted()
+          reportIncomplete(
+            `files/${label} (${item.id}): could not read text; use files read to inspect the error.`
+          )
+          return { scope: 'files', id: item.id, label, text: null }
+        }
+        await importProjectFileProvenance(
+          context.resolvedSecretTraceRegistry,
+          artifact.secretProvenance
+        )
+        let text: string | null = null
+        try {
+          const format = workspaceFileTextFormat({
+            name: artifact.file.name,
+            type: artifact.contentType,
+          })
+          if (!format) throw new Error('No text decoder')
+          const parsed = await parseWorkspaceFileText(artifact.buffer, format, {
+            maxTextBytes: MAX_GREP_BYTES_PER_FILE,
+            signal: context.signal,
+          })
+          if (parsed.metadata?.degraded || parsed.metadata?.truncated)
+            reportIncomplete(
+              `files/${label} (${item.id}): text extraction is incomplete; use files read to inspect it.`
+            )
+          if (!parsed.metadata?.degraded) text = parsed.content
+        } catch {
+          context.signal?.throwIfAborted()
+          reportIncomplete(
+            `files/${label} (${item.id}): could not decode text; use files read to inspect the error.`
+          )
+        }
+        return { scope: 'files', id: item.id, label, text }
+      })
+    },
+  })
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-provenance.ts b/apps/sim/lib/mothership/agent-cli/project-file-provenance.ts
new file mode 100644
index 00000000000..f74059c0578
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-provenance.ts
@@ -0,0 +1,23 @@
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { importDurableSecretProvenance } from '@/lib/execution/durable-secret-provenance'
+import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+/** Import the bound source entries before any Project file bytes reach an agent consumer. */
+export async function importProjectFileProvenance(
+  registry: ResolvedSecretTraceRegistry | undefined,
+  source: WorkspaceFileSecretProvenance | undefined
+) {
+  if (
+    !registry ||
+    source?.status !== 'exact' ||
+    !(await importDurableSecretProvenance(registry, source)) ||
+    registry.isPermanentlyIncomplete()
+  ) {
+    registry?.markIncomplete('project-file-provenance-unavailable')
+    throw new OrchestrationError(
+      'forbidden',
+      'File content cannot be delivered without its secret provenance'
+    )
+  }
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-read.integration.ts b/apps/sim/lib/mothership/agent-cli/project-file-read.integration.ts
new file mode 100644
index 00000000000..eedd4414d18
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-read.integration.ts
@@ -0,0 +1,560 @@
+import { mkdtempSync } from 'node:fs'
+import { mkdir, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { db } from '@sim/db'
+import {
+  permissions,
+  projectWorkspace,
+  user,
+  userStats,
+  workspace,
+  workspaceFileSearchRevision,
+  workspaceFileSecretProvenance,
+  workspaceFiles,
+} from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
+import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
+import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
+import { setUploadDirServer, uploadsSetupMock } from '@sim/testing/mocks/uploads-setup.mock'
+import { getErrorMessage } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { Document, Packer, Paragraph } from 'docx'
+import { eq } from 'drizzle-orm'
+import sharp from 'sharp'
+import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { redisUrl } = await vi.hoisted(async () => {
+  const { readTestRedisUrl } = await import('@sim/db/testing/test-infrastructure')
+  const redisUrl = readTestRedisUrl()
+  if (redisUrl) process.env.REDIS_URL = redisUrl
+  return { redisUrl }
+})
+
+vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
+
+vi.mock('@/lib/uploads/core/setup.server', () => uploadsSetupMock)
+
+import { closeRedisConnection } from '@/lib/core/config/redis'
+import { encryptSecret } from '@/lib/core/security/encryption'
+import { type AgentCliExecutionContext, executeAgentCliRequest } from '@/lib/mothership/agent-cli'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import type { AgentCliAugmentationInvocation } from '@/lib/mothership/generated/agent-cli'
+import { createProjectFile } from '@/lib/projects/files/application'
+import { storeCompiledDoc } from '@/lib/uploads/documents/compiled-store'
+import { fileDocumentInputIdentity } from '@/lib/uploads/documents/input-identity'
+import { createWorkspaceFile } from '@/lib/workspace-files/application/create-workspace-file'
+import { indexWorkspaceFileForSearch } from '@/lib/workspace-files/search/indexing'
+import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const storageRoot = mkdtempSync(join(tmpdir(), 'sim-project-cli-reads-'))
+setUploadDirServer(storageRoot)
+const fixtures: { userId: string; workspaceId: string; projectId: string }[] = []
+const checks: { name: string; status: 'passed' | 'failed'; durationMs: number; error?: string }[] =
+  []
+
+beforeEach(() => {
+  featureFlagsMockFns.mockIsFeatureEnabled.mockImplementation(async (flag) => flag === 'projects')
+  vi.stubEnv('PROJECT_FILES_ENABLED', 'true')
+  vi.stubEnv('FREE_STORAGE_LIMIT_GB', '')
+})
+
+function check(name: string, run: () => Promise<void>, requiresRedis = false) {
+  it.skipIf(requiresRedis && !redisUrl)(name, async () => {
+    const started = performance.now()
+    try {
+      await run()
+      checks.push({ name, status: 'passed', durationMs: performance.now() - started })
+    } catch (error) {
+      checks.push({
+        name,
+        status: 'failed',
+        durationMs: performance.now() - started,
+        error: getErrorMessage(error),
+      })
+      throw error
+    }
+  })
+}
+
+async function fixture() {
+  const userId = generateId()
+  const workspaceId = generateId()
+  await db.insert(user).values({
+    id: userId,
+    email: `${userId}@project-read.invalid`,
+    name: 'File reader',
+    emailVerified: true,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  })
+  await db.insert(userStats).values({ id: generateId(), userId })
+  await insertWorkspaceFixture(db, {
+    id: workspaceId,
+    ownerId: userId,
+    billedAccountUserId: userId,
+    name: 'Read environment',
+  })
+  await db.insert(permissions).values({
+    id: generateId(),
+    userId,
+    entityType: 'workspace',
+    entityId: workspaceId,
+    permissionType: 'admin',
+  })
+  const [binding] = await db
+    .select()
+    .from(projectWorkspace)
+    .where(eq(projectWorkspace.workspaceId, workspaceId))
+  if (!binding) throw new Error('Project fixture missing')
+  const ids = { userId, workspaceId, projectId: binding.projectId }
+  fixtures.push(ids)
+  const context: AgentCliExecutionContext = {
+    userId,
+    workspaceId,
+    requestMode: 'agent',
+    copilotToolExecution: true,
+    toolCallId: generateId(),
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId,
+      invocation: { kind: 'workspace', workspaceId },
+    }),
+    resolvedSecretTraceRegistry: new ResolvedSecretTraceRegistry([], { userId, workspaceId }),
+  }
+  const principal = createSessionPrincipal({ userId })
+  return { ...ids, context, principal }
+}
+
+function read(
+  projectId: string,
+  context: AgentCliExecutionContext,
+  reference: string,
+  flags: AgentCliAugmentationInvocation['flags'] = {},
+  name = 'files read'
+) {
+  return executeAgentCliRequest(
+    {
+      fileOwner: { entityType: 'project', entityId: projectId },
+      invocation: { kind: 'augmentation', name, positionals: [reference], flags },
+    },
+    context
+  )
+}
+
+async function imageContent() {
+  return (
+    await sharp(Buffer.from([25, 80, 150, 255]), {
+      raw: { width: 1, height: 1, channels: 4 },
+    })
+      .png()
+      .toBuffer()
+  ).toString('base64')
+}
+
+check(
+  'Project grep reaches authorized stored bytes and retains their source classification',
+  async () => {
+    const f = await fixture()
+    const secret = 'synthetic-project-grep-canary'
+    const { encrypted } = await encryptSecret(secret)
+    const { file } = await createProjectFile.execute({
+      principal: f.principal,
+      input: {
+        projectId: f.projectId,
+        name: 'grep-notes.txt',
+        contentType: 'text/plain',
+        content: `before\n${secret}\nafter`,
+        encoding: 'utf-8',
+        secretProvenance: {
+          status: 'exact',
+          entries: [
+            {
+              encryptedValue: encrypted,
+              sourceUserId: f.userId,
+              sourceWorkspaceId: f.workspaceId,
+              name: 'CANARY',
+            },
+          ],
+        },
+      },
+    })
+    const result = await read(
+      f.projectId,
+      f.context,
+      'canary',
+      { scope: 'files', in: `files/${file.id}` },
+      'grep'
+    )
+    expect(result.exitCode, result.stderr).toBe(0)
+    expect(result.stdout).toContain(`files/grep-notes.txt (${file.id}):2:`)
+    expect(
+      f.context.resolvedSecretTraceRegistry?.exportCommittedProvenanceForValue(result.stdout)
+        .entries.length
+    ).toBeGreaterThan(0)
+  }
+)
+
+describe('Project CLI representations against PostgreSQL and stored bytes', () => {
+  check(
+    'native workspace content search reaches its collection operation instead of a file named search',
+    async () => {
+      const f = await fixture()
+      const result = await executeAgentCliRequest(
+        {
+          fileOwner: { entityType: 'workspace', entityId: f.workspaceId },
+          invocation: {
+            kind: 'cli',
+            argv: ['files', 'search', '--query', 'absent-needle', '--mode', 'exact'],
+          },
+        },
+        f.context
+      )
+      expect(result.exitCode, result.stderr).toBe(0)
+      expect(JSON.parse(result.stdout)).toMatchObject({ count: 0, results: [], complete: true })
+    }
+  )
+
+  check(
+    'native indexed workspace delivery imports root and input secrets and denies missing input tracking',
+    async () => {
+      const f = await fixture()
+      const owner = { entityType: 'workspace' as const, entityId: f.workspaceId }
+      const { encrypted: rootSecret } = await encryptSecret('root-native-secret')
+      const { encrypted: inputSecret } = await encryptSecret('input-native-secret')
+      const create = async (name: string, content: string, encryptedValue: string) =>
+        createWorkspaceFile.execute({
+          principal: f.principal,
+          input: {
+            workspaceId: f.workspaceId,
+            name,
+            contentType: 'text/plain',
+            content,
+            encoding: 'utf-8',
+            exactName: true,
+            secretProvenance: {
+              status: 'exact',
+              entries: [
+                { encryptedValue, sourceUserId: f.userId, sourceWorkspaceId: f.workspaceId },
+              ],
+            },
+          },
+        })
+      const { file: dependency } = await create('input.txt', 'input-native-secret', inputSecret)
+      const source = `getFileBase64('${dependency.id}')`
+      const { file } = await create('generated.docx', source, rootSecret)
+      const [inputRow] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.id, dependency.id))
+      const artifact = await Packer.toBuffer(
+        new Document({
+          sections: [
+            {
+              children: [
+                new Paragraph('nativeprovenanceneedle root-native-secret input-native-secret'),
+              ],
+            },
+          ],
+        })
+      )
+      await storeCompiledDoc(
+        owner,
+        source,
+        'docx',
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        artifact,
+        fileDocumentInputIdentity(owner, [inputRow])
+      )
+      const token = new Date()
+      const [revision] = await db
+        .update(workspaceFileSearchRevision)
+        .set({ dispatchedAt: token })
+        .where(eq(workspaceFileSearchRevision.fileId, file.id))
+        .returning()
+      await indexWorkspaceFileForSearch(
+        {
+          owner,
+          fileId: file.id,
+          sourceContentUpdatedAt: revision.sourceContentUpdatedAt.toISOString(),
+          dispatchToken: token.toISOString(),
+        },
+        new AbortController().signal
+      )
+      const invocation = {
+        kind: 'cli' as const,
+        argv: ['files', 'search', '--query', 'nativeprovenanceneedle', '--mode', 'exact'],
+      }
+      const result = await executeAgentCliRequest({ fileOwner: owner, invocation }, f.context)
+      expect(result.exitCode, result.stderr).toBe(0)
+      expect(JSON.parse(result.stdout).results[0].fileId).toBe(file.id)
+      expect(f.context.resolvedSecretTraceRegistry?.exportProvenance()).toMatchObject({
+        complete: true,
+        entries: expect.arrayContaining([
+          expect.objectContaining({ encryptedValue: rootSecret }),
+          expect.objectContaining({ encryptedValue: inputSecret }),
+        ]),
+      })
+      await db
+        .delete(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, dependency.id))
+      const rejected = await executeAgentCliRequest(
+        { fileOwner: owner, invocation },
+        {
+          ...f.context,
+          resolvedSecretTraceRegistry: new ResolvedSecretTraceRegistry([], {
+            userId: f.userId,
+            workspaceId: f.workspaceId,
+          }),
+        }
+      )
+      expect(rejected.exitCode).not.toBe(0)
+      expect(rejected.stdout).toBe('')
+    },
+    true
+  )
+
+  check(
+    'explicit workspace file owners preserve native reads and reject conflicting invocation scope',
+    async () => {
+      const f = await fixture()
+      const { file } = await createWorkspaceFile.execute({
+        principal: f.principal,
+        input: {
+          workspaceId: f.workspaceId,
+          name: 'workspace-owner.md',
+          contentType: 'text/markdown',
+          content: 'Canonical workspace documentation',
+          encoding: 'utf-8',
+          exactName: true,
+        },
+      })
+      const owner = { entityType: 'workspace' as const, entityId: f.workspaceId }
+      const invocation = { kind: 'cli' as const, argv: ['files', 'describe', file.id] }
+      const explicit = await executeAgentCliRequest({ fileOwner: owner, invocation }, f.context)
+      expect(explicit.exitCode, explicit.stderr).toBe(0)
+      expect(explicit.stdout).toContain(file.id)
+      expect(explicit.resources).toContainEqual({
+        op: 'upsert',
+        readOnly: true,
+        resource: expect.objectContaining({ type: 'file', id: file.id, owner }),
+      })
+      const legacy = await executeAgentCliRequest(
+        { workspaceId: f.workspaceId, invocation },
+        f.context
+      )
+      expect(legacy.exitCode, legacy.stderr).toBe(0)
+      expect(legacy.stdout).toBe(explicit.stdout)
+      await expect(
+        executeAgentCliRequest(
+          { fileOwner: owner, workspaceId: generateId(), invocation },
+          f.context
+        )
+      ).rejects.toMatchObject({ code: 'validation' })
+      const other = await fixture()
+      await expect(
+        executeAgentCliRequest(
+          { fileOwner: { ...owner, entityId: other.workspaceId }, invocation },
+          f.context
+        )
+      ).rejects.toMatchObject({ code: 'not_found' })
+    }
+  )
+
+  check(
+    'generated Project pages reach the model as rendered documents with canonical ownership',
+    async () => {
+      const f = await fixture()
+      const { file } = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          projectId: f.projectId,
+          name: 'design.html',
+          contentType: 'text/x-sim-page',
+          content:
+            '---\ntitle: Project architecture\n---\n\n# Shared design\n\nThe durable Project context.',
+          encoding: 'utf-8',
+        },
+      })
+      const result = await read(f.projectId, f.context, file.id)
+      expect(result.exitCode, result.stderr).toBe(0)
+      const output = JSON.parse(result.stdout)
+      expect(output.representation).toBe('text')
+      expect(output.type).toBe('text/html')
+      expect(output.text).toContain('The durable Project context.')
+      expect(output.path).toBe(`projects/${f.projectId}/files/design`)
+      expect(result.resources?.[0]).toMatchObject({
+        resource: { id: file.id, owner: { entityType: 'project', entityId: f.projectId } },
+      })
+    }
+  )
+
+  check(
+    'Project references read the selected owner and preserve text line selection and resource ownership',
+    async () => {
+      const f = await fixture()
+      const { file } = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          projectId: f.projectId,
+          name: 'architecture.md',
+          contentType: 'text/markdown',
+          content: 'Heading\nProject line\nEnd',
+          encoding: 'utf-8',
+        },
+      })
+      for (const reference of [file.id, `projects/${f.projectId}/files/architecture.md`]) {
+        const result = await read(f.projectId, f.context, reference, { offset: '2', limit: '1' })
+        expect(result.exitCode, result.stderr).toBe(0)
+        expect(JSON.parse(result.stdout)).toMatchObject({
+          fileId: file.id,
+          path: `projects/${f.projectId}/files/architecture.md`,
+          representation: 'text',
+          text: 'Project line',
+        })
+        expect(result.resources).toContainEqual({
+          op: 'upsert',
+          readOnly: true,
+          resource: {
+            type: 'file',
+            id: file.id,
+            title: file.name,
+            owner: { entityType: 'project', entityId: f.projectId },
+          },
+        })
+      }
+      const invalidFlags: AgentCliAugmentationInvocation['flags'][] = [
+        { offset: '1', render: true },
+        { limit: true },
+        { 'max-bytes': '0' },
+        { pages: '' },
+      ]
+      for (const flags of invalidFlags) {
+        const result = await read(f.projectId, f.context, file.id, flags)
+        expect(result.exitCode).not.toBe(0)
+        expect(result.stdout).toBe('')
+      }
+      const foreign = await fixture()
+      const result = await read(
+        f.projectId,
+        f.context,
+        `projects/${foreign.projectId}/files/architecture.md`
+      )
+      expect(result.exitCode).not.toBe(0)
+      expect(result.stdout).toBe('')
+    }
+  )
+
+  check(
+    'visual Project reads expose the authorized image bytes and owner without a workspace file route',
+    async () => {
+      const f = await fixture()
+      const content = await imageContent()
+      const { file } = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          projectId: f.projectId,
+          name: 'diagram.png',
+          contentType: 'image/png',
+          content,
+          encoding: 'base64',
+        },
+      })
+      for (const name of ['files read', 'files view']) {
+        const result = await read(f.projectId, f.context, file.id, {}, name)
+        expect(result.exitCode, result.stderr).toBe(0)
+        expect(JSON.parse(result.stdout)).toMatchObject({
+          fileId: file.id,
+          representation: 'visual',
+          path: `projects/${f.projectId}/files/diagram.png`,
+        })
+        expect(result.observations).toMatchObject([{ resourceId: file.id, mediaType: 'image/png' }])
+        const observation = result.observations?.[0]
+        if (!observation) throw new Error('Image observation missing')
+        const pixels = await sharp(Buffer.from(observation.data, 'base64'))
+          .ensureAlpha()
+          .raw()
+          .toBuffer()
+        expect([...pixels]).toEqual([25, 80, 150, 255])
+      }
+    }
+  )
+
+  check(
+    'missing file tracking or a missing caller registry prevents content delivery after a successful metadata lookup',
+    async () => {
+      const f = await fixture()
+      const { file } = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          projectId: f.projectId,
+          name: 'restricted.md',
+          contentType: 'text/markdown',
+          content: 'must not be emitted',
+          encoding: 'utf-8',
+        },
+      })
+      const missingRegistry = await read(
+        f.projectId,
+        { ...f.context, resolvedSecretTraceRegistry: undefined },
+        file.id
+      )
+      expect(missingRegistry.exitCode).not.toBe(0)
+      expect(missingRegistry.stdout).toBe('')
+      expect(missingRegistry.observations).toBeUndefined()
+      await db
+        .delete(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, file.id))
+      const missingTracking = await read(f.projectId, f.context, file.id)
+      expect(missingTracking.exitCode).not.toBe(0)
+      expect(missingTracking.stdout).toBe('')
+      expect(missingTracking.observations).toBeUndefined()
+    }
+  )
+
+  check(
+    'visual content with known secret provenance is not emitted as an opaque model observation',
+    async () => {
+      const f = await fixture()
+      const { encrypted } = await encryptSecret('secret-visible-in-image')
+      const { file } = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          projectId: f.projectId,
+          name: 'restricted.png',
+          contentType: 'image/png',
+          content: await imageContent(),
+          encoding: 'base64',
+          secretProvenance: {
+            status: 'exact',
+            entries: [
+              {
+                encryptedValue: encrypted,
+                sourceUserId: f.userId,
+                sourceWorkspaceId: f.workspaceId,
+                name: 'TOKEN',
+              },
+            ],
+          },
+        },
+      })
+      const result = await read(f.projectId, f.context, file.id)
+      expect(result.exitCode).not.toBe(0)
+      expect(result.stdout).toBe('')
+      expect(result.observations).toBeUndefined()
+    }
+  )
+})
+
+afterAll(async () => {
+  for (const f of fixtures) {
+    await db.delete(workspaceFiles).where(eq(workspaceFiles.projectId, f.projectId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, f.workspaceId))
+    await db.delete(user).where(eq(user.id, f.userId))
+  }
+  await rm(storageRoot, { recursive: true, force: true })
+  const report = process.env.PROJECT_FILE_READ_REPORT_PATH ?? 'test-results/project-file-read.json'
+  await mkdir(dirname(report), { recursive: true })
+  await writeFile(report, JSON.stringify({ checks }, null, 2))
+  await closeRedisConnection()
+  await db.$client.end()
+})
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-read.ts b/apps/sim/lib/mothership/agent-cli/project-file-read.ts
new file mode 100644
index 00000000000..cb8a0779932
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-read.ts
@@ -0,0 +1,127 @@
+import { v2ReadFileTextQuerySchema } from '@/lib/api/contracts/v2/files'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { fileReadFailure } from '@/lib/mothership/agent-cli/engines/file-view'
+import { observePrivateFile } from '@/lib/mothership/agent-cli/engines/observe-private-file'
+import { importProjectFileProvenance } from '@/lib/mothership/agent-cli/project-file-provenance'
+import { agentCliFail } from '@/lib/mothership/agent-cli/types'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import type {
+  AgentCliAugmentationInvocation,
+  AgentCliRawResult,
+} from '@/lib/mothership/generated/agent-cli'
+import {
+  readProjectFileArtifact,
+  resolveProjectFileReference,
+} from '@/lib/projects/files/application'
+import { workspaceFileVfsPath } from '@/lib/uploads/contexts/workspace'
+import { MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+import { MAX_TEXT_EXTRACTION_BYTES, resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils'
+import { fileOwnerVfsPath } from '@/lib/workspace-files/owner-paths'
+
+const projectReadQuerySchema = v2ReadFileTextQuerySchema.omit({ workspaceId: true })
+const READ_FLAGS = new Set(['max-bytes', 'offset', 'limit', 'render', 'pages'])
+
+/** Project observation reuses file decoders after canonical reference and exact-file authorization. */
+export async function readProjectFileForAgent(
+  invocation: AgentCliAugmentationInvocation,
+  context: AgentCliExecutionContext,
+  projectId: string
+): Promise<AgentCliRawResult> {
+  if (invocation.name !== 'files read' && invocation.name !== 'files view')
+    return agentCliFail('This Project file operation is not supported.')
+  const { flags, positionals } = invocation
+  const reference = positionals[0]
+  if (!reference || positionals.length !== 1)
+    return agentCliFail('Project file reads require one file ID or Project file path.')
+  for (const flag of Object.keys(flags)) {
+    if (!READ_FLAGS.has(flag)) return agentCliFail(`Unsupported Project file read flag: --${flag}`)
+  }
+  for (const flag of ['max-bytes', 'offset', 'limit']) {
+    if (flags[flag] === true) return agentCliFail(`--${flag} requires a value.`)
+  }
+  if (flags.render !== undefined && flags.render !== true)
+    return agentCliFail('--render is a flag without a value.')
+  if (flags.pages !== undefined && (typeof flags.pages !== 'string' || !flags.pages.trim()))
+    return agentCliFail('--pages requires a page number or range.')
+  const textRange = flags.offset !== undefined || flags.limit !== undefined
+  const explicitVisual =
+    invocation.name === 'files view' || flags.render === true || flags.pages !== undefined
+  if (textRange && explicitVisual)
+    return agentCliFail('Use text line ranges or visual page options in one read, not both.')
+  const query = projectReadQuerySchema.safeParse({
+    ...(flags['max-bytes'] !== undefined ? { maxBytes: flags['max-bytes'] } : {}),
+    ...(flags.offset !== undefined ? { offset: flags.offset } : {}),
+    ...(flags.limit !== undefined ? { limit: flags.limit } : {}),
+  })
+  if (!query.success)
+    return agentCliFail(query.error.issues.map((issue) => issue.message).join('; '))
+  try {
+    context.signal?.throwIfAborted()
+    const resolved = await executeCopilotProjectFileUseCase(
+      context,
+      resolveProjectFileReference,
+      { projectId, fileReference: reference },
+      { projectId }
+    )
+    const target = { projectId, fileId: resolved.file.id }
+    const { file, buffer, contentType, secretProvenance } = await executeCopilotProjectFileUseCase(
+      context,
+      readProjectFileArtifact,
+      {
+        ...target,
+        maxBytes: query.data.maxBytes ?? MAX_TEXT_EXTRACTION_BYTES,
+        forModel: explicitVisual,
+      },
+      target
+    )
+    await importProjectFileProvenance(context.resolvedSecretTraceRegistry, secretProvenance)
+    context.signal?.throwIfAborted()
+    const type =
+      resolveEffectiveMimeType(contentType, file.name).split(';')[0]?.trim().toLowerCase() ?? ''
+    const visual =
+      explicitVisual || (!textRange && (type.startsWith('image/') || type === 'application/pdf'))
+    /** Default visual selection uses the authorized artifact's MIME, not earlier discovery metadata. */
+    if (visual && (secretProvenance.status !== 'exact' || secretProvenance.entries.length !== 0))
+      throw new OrchestrationError('forbidden', MODEL_UNSAFE_WORKSPACE_FILE_ERROR_MESSAGE)
+    const result = await observePrivateFile(
+      {
+        buffer,
+        name: file.name,
+        contentType: type,
+        fileId: file.id,
+        path: fileOwnerVfsPath(file.owner, workspaceFileVfsPath(file)),
+        source: 'project',
+      },
+      flags,
+      { ...query.data, visual },
+      context.signal
+    )
+    const resource = {
+      type: 'file' as const,
+      id: file.id,
+      title: file.name,
+      owner: { entityType: 'project' as const, entityId: projectId },
+    }
+    return {
+      ...result,
+      ...(result.observations
+        ? {
+            observations: result.observations.map((observation) => ({
+              ...observation,
+              resource,
+            })),
+          }
+        : {}),
+      resources: [
+        {
+          op: 'upsert',
+          readOnly: true,
+          resource,
+        },
+      ],
+    }
+  } catch (error) {
+    return fileReadFailure(error)
+  }
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-transport.ts b/apps/sim/lib/mothership/agent-cli/project-file-transport.ts
new file mode 100644
index 00000000000..00368a2167a
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-transport.ts
@@ -0,0 +1,35 @@
+import { markCopilotProjectFileRequest } from '@/lib/api/server/routes/copilot-request'
+import { createScopedCliTransport } from '@/lib/mothership/agent-cli/scoped-transport'
+import type { CopilotExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import type { ProjectFileTarget } from '@/lib/projects/files/application/authorization'
+
+const PROJECT_FILES_ROUTE = '/api/v2/projects/{projectId}/files'
+
+/** Project transport binds owner-specific routes to exact, freshly authorized resource grants. */
+export function createProjectFileCliTransport(
+  endpoint: string,
+  context: CopilotExecutionContext,
+  target: ProjectFileTarget
+): typeof fetch {
+  const bound = Object.freeze({ ...target })
+  return createScopedCliTransport(endpoint, {
+    admitRequest(request, route) {
+      if (
+        (route.pattern !== PROJECT_FILES_ROUTE &&
+          !route.pattern.startsWith(`${PROJECT_FILES_ROUTE}/`)) ||
+        route.params.projectId !== bound.projectId ||
+        (bound.fileId !== undefined && route.params.fileId !== bound.fileId)
+      ) {
+        return Response.json({ error: 'CLI target is unavailable' }, { status: 400 })
+      }
+      try {
+        markCopilotProjectFileRequest(request, context, {
+          projectId: bound.projectId,
+          ...(route.params.fileId !== undefined ? { fileId: route.params.fileId } : {}),
+        })
+      } catch {
+        return Response.json({ error: 'Project file authority is unavailable' }, { status: 403 })
+      }
+    },
+  })
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-upload-transport.ts b/apps/sim/lib/mothership/agent-cli/project-file-upload-transport.ts
new file mode 100644
index 00000000000..1f95f85558d
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-upload-transport.ts
@@ -0,0 +1,153 @@
+import { createLogger } from '@sim/logger'
+import { NextRequest } from 'next/server'
+import {
+  v2CompleteProjectFileUploadContract,
+  v2CreateProjectFileUploadContract,
+} from '@/lib/api/contracts/v2/project-file-uploads'
+import { matchV2Route } from '@/lib/api/server/routes/in-process-transport'
+import {
+  V2_PARSE_DEFAULTS,
+  v2InvalidBodyResponse,
+  v2OrchestrationErrorPolicy,
+} from '@/lib/api/server/routes/v2-json-route'
+import { parseRequest } from '@/lib/api/server/validation'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { requireCleanProjectFileMetadata } from '@/lib/mothership/agent-cli/project-file-write-provenance'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import { requireTrustedCopilotResourceExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import { toV2ProjectFileUpload } from '@/lib/projects/files/api/upload-presenter'
+import {
+  completeProjectFileUploadSession,
+  createProjectFileUploadSession,
+} from '@/lib/projects/files/application'
+import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+import { v2Data, v2Error } from '@/app/api/v2/lib/response'
+import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const logger = createLogger('ProjectFileUploadTransport')
+const UPLOADS_ROUTE = '/api/v2/projects/{projectId}/files/uploads'
+
+/** Private control seals a streamed receipt only after the workbench observer has consumed its actual bytes. */
+export function createProjectFileUploadTransport(options: {
+  endpoint: string
+  projectId: string
+  context: AgentCliExecutionContext
+  fallback: typeof fetch
+  resolveSecretTraceRegistry?: () => Promise<ResolvedSecretTraceRegistry>
+  uploadProvenance?: () => WorkspaceFileSecretProvenance | Promise<WorkspaceFileSecretProvenance>
+  uploadBinding?: {
+    record(uploadId: string): Promise<void>
+    contains(uploadId: string): Promise<boolean>
+  }
+}): typeof fetch {
+  const { context, projectId, fallback, uploadProvenance } = options
+  const origin = new URL(options.endpoint).origin
+  const created = new Set<string>()
+  return async (input, init) => {
+    const originalRequest = new Request(input, init)
+    const url = new URL(originalRequest.url)
+    let route: ReturnType<typeof matchV2Route>
+    try {
+      route = matchV2Route(url.pathname)
+    } catch {
+      return v2Error('BAD_REQUEST', 'CLI target is unavailable')
+    }
+    if (url.origin !== origin || !route || route.params.projectId !== projectId) {
+      return v2Error('BAD_REQUEST', 'CLI target is unavailable')
+    }
+    const creating = originalRequest.method === 'POST' && route.pattern === UPLOADS_ROUTE
+    const completing =
+      originalRequest.method === 'POST' && route.pattern === `${UPLOADS_ROUTE}/{uploadId}/complete`
+    if (!creating && !completing) return fallback(originalRequest)
+    const request = new NextRequest(originalRequest)
+    try {
+      requireTrustedCopilotResourceExecutionContext(context)
+    } catch {
+      return v2Error('FORBIDDEN', 'Project file authority is unavailable')
+    }
+    try {
+      context.signal?.throwIfAborted()
+      request.signal.throwIfAborted()
+      if (creating) {
+        const parsed = await parseRequest(
+          v2CreateProjectFileUploadContract,
+          request,
+          { params: route.params },
+          { ...V2_PARSE_DEFAULTS, invalidJsonResponse: () => v2InvalidBodyResponse(request) }
+        )
+        if (!parsed.success) return parsed.response
+        const { body } = parsed.data
+        await requireCleanProjectFileMetadata(body, options)
+        context.signal?.throwIfAborted()
+        request.signal.throwIfAborted()
+        const session = await executeCopilotProjectFileUseCase(
+          context,
+          createProjectFileUploadSession,
+          {
+            projectId,
+            fileName: body.name,
+            contentType: body.contentType,
+            fileSize: body.size,
+            folderId: body.folderId,
+            folderPath: body.folderPath,
+            localOrigin: origin,
+            secretProvenance: 'pending',
+          },
+          { projectId }
+        )
+        created.add(session.id)
+        await options.uploadBinding?.record(session.id)
+        return v2Data(
+          {
+            session: toV2ProjectFileUpload(session, null),
+            uploadToken: session.uploadToken,
+            transfer: session.transfer,
+          },
+          { status: 201 }
+        )
+      }
+      const parsed = await parseRequest(
+        v2CompleteProjectFileUploadContract,
+        request,
+        { params: route.params },
+        V2_PARSE_DEFAULTS
+      )
+      if (!parsed.success) return parsed.response
+      const bound = options.uploadBinding
+        ? await options.uploadBinding.contains(parsed.data.params.uploadId)
+        : created.has(parsed.data.params.uploadId)
+      if (!bound) {
+        return v2Error('FORBIDDEN', 'Upload completion is not bound to this invocation')
+      }
+      let secretProvenance: WorkspaceFileSecretProvenance | undefined
+      try {
+        secretProvenance = await uploadProvenance?.()
+      } catch {
+        context.signal?.throwIfAborted()
+        request.signal.throwIfAborted()
+      }
+      if (!secretProvenance) {
+        return v2Error('SERVICE_UNAVAILABLE', 'Workbench upload source has not finished streaming')
+      }
+      const result = await executeCopilotProjectFileUseCase(
+        context,
+        completeProjectFileUploadSession,
+        {
+          projectId,
+          uploadId: parsed.data.params.uploadId,
+          uploadToken: parsed.data.headers['upload-token'],
+          secretProvenance,
+        },
+        { projectId }
+      )
+      return v2Data(toV2ProjectFileUpload(result.session, result.value.file))
+    } catch (error) {
+      context.signal?.throwIfAborted()
+      request.signal.throwIfAborted()
+      const response = v2OrchestrationErrorPolicy.render(error)
+      if (response) return response
+      logger.error('Project upload control failed', { error })
+      return v2Error('INTERNAL_ERROR', 'Project upload control could not be completed')
+    }
+  }
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-write-provenance.ts b/apps/sim/lib/mothership/agent-cli/project-file-write-provenance.ts
new file mode 100644
index 00000000000..c16bbb3ff1b
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-write-provenance.ts
@@ -0,0 +1,24 @@
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+/** Shared metadata is public even when the file's bytes retain protected provenance. */
+export async function requireCleanProjectFileMetadata(
+  value: unknown,
+  options: {
+    context: AgentCliExecutionContext
+    resolveSecretTraceRegistry?: () => Promise<ResolvedSecretTraceRegistry>
+  }
+): Promise<void> {
+  const { context } = options
+  context.signal?.throwIfAborted()
+  const registry = options.resolveSecretTraceRegistry
+    ? await options.resolveSecretTraceRegistry()
+    : context.resolvedSecretTraceRegistry
+  const provenance = registry?.exportCommittedProvenanceForValue(value, { anonymous: true })
+  if (!provenance?.complete || provenance.entries.length !== 0)
+    throw new OrchestrationError(
+      'forbidden',
+      'Project file metadata or content cannot be published without complete, empty secret provenance'
+    )
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-write-transport.integration.ts b/apps/sim/lib/mothership/agent-cli/project-file-write-transport.integration.ts
new file mode 100644
index 00000000000..3ced6f67a28
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-write-transport.integration.ts
@@ -0,0 +1,711 @@
+import { createHash } from 'node:crypto'
+import { mkdtempSync } from 'node:fs'
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { db } from '@sim/db'
+import {
+  copilotAsyncToolCalls,
+  copilotChats,
+  copilotRuns,
+  folder,
+  outboxEvent,
+  permissions,
+  projectWorkspace,
+  uploadSession,
+  user,
+  userStats,
+  workspace,
+  workspaceFileSecretProvenance,
+  workspaceFiles,
+} from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
+import { sha256Hex } from '@sim/security/hash'
+import { createDeferred } from '@sim/testing/helpers/deferred'
+import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
+import {
+  remoteSandboxProviderMock,
+  remoteSandboxProviderMockFns,
+} from '@sim/testing/mocks/remote-sandbox-provider.mock'
+import { setUploadDirServer, uploadsSetupMock } from '@sim/testing/mocks/uploads-setup.mock'
+import { getErrorMessage } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { eq, sql } from 'drizzle-orm'
+import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { redisUrl } = await vi.hoisted(async () => {
+  const { readTestRedisUrl } = await import('@sim/db/testing/test-infrastructure')
+  const redisUrl = readTestRedisUrl()
+  if (redisUrl) process.env.REDIS_URL = redisUrl
+  return { redisUrl }
+})
+vi.mock('@/lib/execution/remote-sandbox/provider', () => remoteSandboxProviderMock)
+
+vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
+
+vi.mock('@/lib/uploads/core/setup.server', () => uploadsSetupMock)
+
+import {
+  v2CompleteProjectFileUploadContract,
+  v2CreateProjectFileUploadContract,
+} from '@/lib/api/contracts/v2/project-file-uploads'
+import { closeRedisConnection, getRedisClient } from '@/lib/core/config/redis'
+import { encryptSecret } from '@/lib/core/security/encryption'
+import {
+  initializeSessionFileProvenance,
+  readSessionSecretProvenance,
+  recordSessionFileInput,
+} from '@/lib/execution/remote-sandbox/session-file-provenance'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { createProjectFileUploadTransport } from '@/lib/mothership/agent-cli/project-file-upload-transport'
+import { createProjectFileWriteTransport } from '@/lib/mothership/agent-cli/project-file-write-transport'
+import { executeProjectFileCliRequest } from '@/lib/mothership/agent-cli/project-files'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import { proxySandboxResourceRequest } from '@/lib/mothership/tools/sandbox-resource-transport'
+import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+import { writeLocalPutObject } from '@/lib/uploads/upload-session/provider'
+import {
+  uploadSessionObjectMetadata,
+  verifyUploadSessionToken,
+} from '@/lib/uploads/upload-session/service'
+import { workspaceFileRevision } from '@/lib/workspace-files/application/file-revision'
+import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const callbackRedisKeys: string[] = []
+const storageRoot = mkdtempSync(join(tmpdir(), 'sim-project-cli-writes-'))
+setUploadDirServer(storageRoot)
+const fixtures: {
+  userId: string
+  workspaceId: string
+  projectId: string
+  originWorkspaceId?: string
+}[] = []
+const checks: { name: string; status: 'passed' | 'failed'; durationMs: number; error?: string }[] =
+  []
+
+beforeEach(() => {
+  featureFlagsMockFns.mockIsFeatureEnabled.mockImplementation(async (flag) => flag === 'projects')
+  vi.stubEnv('PROJECT_FILES_ENABLED', 'true')
+  vi.stubEnv('FREE_STORAGE_LIMIT_GB', '')
+})
+
+function check(name: string, run: () => Promise<void>) {
+  it(name, async () => {
+    const started = performance.now()
+    try {
+      await run()
+      checks.push({ name, status: 'passed', durationMs: performance.now() - started })
+    } catch (error) {
+      checks.push({
+        name,
+        status: 'failed',
+        durationMs: performance.now() - started,
+        error: getErrorMessage(error),
+      })
+      throw error
+    }
+  })
+}
+
+async function fixture(crossProject = false) {
+  const userId = generateId()
+  const workspaceId = generateId()
+  await db.insert(user).values({
+    id: userId,
+    email: `${userId}@private-project.invalid`,
+    name: 'Project writer',
+    emailVerified: true,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  })
+  await db.insert(userStats).values({ id: generateId(), userId })
+  await insertWorkspaceFixture(db, {
+    id: workspaceId,
+    ownerId: userId,
+    billedAccountUserId: userId,
+    name: 'Authoring environment',
+  })
+  await db.insert(permissions).values({
+    id: generateId(),
+    userId,
+    entityType: 'workspace',
+    entityId: workspaceId,
+    permissionType: 'admin',
+  })
+  const [binding] = await db
+    .select()
+    .from(projectWorkspace)
+    .where(eq(projectWorkspace.workspaceId, workspaceId))
+  if (!binding) throw new Error('Project fixture missing')
+  const originWorkspaceId = crossProject ? generateId() : workspaceId
+  if (crossProject) {
+    await insertWorkspaceFixture(db, {
+      id: originWorkspaceId,
+      ownerId: userId,
+      billedAccountUserId: userId,
+      name: 'Different origin Project',
+    })
+    await db.insert(permissions).values({
+      id: generateId(),
+      userId,
+      entityType: 'workspace',
+      entityId: originWorkspaceId,
+      permissionType: 'read',
+    })
+  }
+  const ids = { userId, workspaceId, projectId: binding.projectId, originWorkspaceId }
+  fixtures.push(ids)
+  const context: AgentCliExecutionContext = {
+    userId,
+    workspaceId: originWorkspaceId,
+    requestMode: 'agent',
+    copilotToolExecution: true,
+    toolCallId: generateId(),
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId,
+      invocation: { kind: 'workspace', workspaceId: originWorkspaceId },
+    }),
+    resolvedSecretTraceRegistry: new ResolvedSecretTraceRegistry([], {
+      userId,
+      workspaceId: originWorkspaceId,
+    }),
+  }
+  return { ...ids, context }
+}
+
+function invoke(projectId: string, context: AgentCliExecutionContext, args: string[]) {
+  return executeProjectFileCliRequest(
+    {
+      fileOwner: { entityType: 'project', entityId: projectId },
+      invocation: { kind: 'cli', argv: ['projects', 'files', ...args] },
+    },
+    context,
+    projectId
+  )
+}
+
+function create(
+  projectId: string,
+  context: AgentCliExecutionContext,
+  content = 'Architecture notes',
+  encoding = 'utf-8'
+) {
+  return invoke(projectId, context, [
+    'create',
+    projectId,
+    '--name',
+    'architecture.md',
+    '--content',
+    content,
+    '--encoding',
+    encoding,
+  ])
+}
+
+async function rows(projectId: string) {
+  return db.select().from(workspaceFiles).where(eq(workspaceFiles.projectId, projectId))
+}
+
+describe('private native Project writes against PostgreSQL and local storage', () => {
+  for (const [operation, signalOwner] of [
+    ['create', 'context'],
+    ['update', 'context'],
+    ['create', 'request'],
+    ['update', 'request'],
+  ] as const) {
+    check(
+      `${signalOwner} cancellation during provenance lookup prevents ${operation}`,
+      async () => {
+        const f = await fixture()
+        if (operation === 'update') expect((await create(f.projectId, f.context)).exitCode).toBe(0)
+        const before = await rows(f.projectId)
+        const controller = new AbortController()
+        const entered = createDeferred<void>()
+        const registry = createDeferred<ResolvedSecretTraceRegistry>()
+        const endpoint = 'http://localhost:3200'
+        const transport = createProjectFileWriteTransport({
+          endpoint,
+          projectId: f.projectId,
+          context: {
+            ...f.context,
+            signal: signalOwner === 'context' ? controller.signal : undefined,
+          },
+          resolveSecretTraceRegistry: () => {
+            entered.resolve()
+            return registry.promise
+          },
+          fallback: async () => {
+            throw new Error('Unexpected fallback')
+          },
+        })
+        const result = transport(
+          `${endpoint}/api/v2/projects/${f.projectId}/files${operation === 'update' ? `/${before[0].id}/content` : ''}`,
+          {
+            method: operation === 'update' ? 'PUT' : 'POST',
+            signal: signalOwner === 'request' ? controller.signal : undefined,
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify(
+              operation === 'update'
+                ? {
+                    content: 'cancelled content',
+                    expectedRevision: workspaceFileRevision(before[0]),
+                  }
+                : { name: 'cancelled.txt', content: 'cancelled content' }
+            ),
+          }
+        )
+        const rejected = expect(result).rejects.toThrow('cancelled during provenance lookup')
+        await entered.promise
+        controller.abort(new Error('cancelled during provenance lookup'))
+        registry.resolve(new ResolvedSecretTraceRegistry([], { userId: f.userId }))
+        await rejected
+        expect(await rows(f.projectId)).toEqual(before)
+        if (operation === 'update')
+          expect(await readFile(join(storageRoot, before[0].key), 'utf8')).toBe(
+            'Architecture notes'
+          )
+      }
+    )
+  }
+
+  check('request bodies and headers cannot mint provenance or Copilot authority', async () => {
+    const f = await fixture()
+    const endpoint = 'http://localhost:3200'
+    const fallback: typeof fetch = async () => {
+      throw new Error('Write unexpectedly fell through to public transport')
+    }
+    const send = (context: AgentCliExecutionContext, extra: Record<string, unknown> = {}) =>
+      createProjectFileWriteTransport({ endpoint, projectId: f.projectId, context, fallback })(
+        `${endpoint}/api/v2/projects/${f.projectId}/files`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-Secret-Provenance': 'exact',
+            'X-Copilot-User-Id': f.userId,
+          },
+          body: JSON.stringify({ name: 'spoof.md', content: 'plain', ...extra }),
+        }
+      )
+    expect(
+      (await send(f.context, { secretProvenance: { status: 'exact', entries: [] } })).status
+    ).toBe(400)
+    expect((await send({ ...f.context, resolvedSecretTraceRegistry: undefined })).status).toBe(403)
+    expect((await send({ ...f.context, copilotResourceAdmission: undefined })).status).toBe(403)
+    expect(await rows(f.projectId)).toEqual([])
+  })
+
+  check(
+    'cross-Project inline writes preserve provenance and revision conflicts do not overwrite bytes',
+    async () => {
+      const f = await fixture(true)
+      const created = await create(f.projectId, f.context)
+      expect(created.exitCode, created.stderr).toBe(0)
+      const [file] = await rows(f.projectId)
+      if (!file) throw new Error('Created file missing')
+      const [sidecar] = await db
+        .select()
+        .from(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, file.id))
+      expect(sidecar).toMatchObject({ status: 'exact', entries: [] })
+      expect(file.userId).toBe(f.userId)
+      expect(await readFile(join(storageRoot, file.key), 'utf8')).toBe('Architecture notes')
+      const revision = workspaceFileRevision(file)
+      if (!revision) throw new Error('Created file has no revision')
+      const args = [
+        'set-content',
+        f.projectId,
+        file.id,
+        '--content',
+        'updated',
+        '--expected-revision',
+        revision,
+      ]
+      expect(await invoke(f.projectId, f.context, args)).toMatchObject({ exitCode: 0 })
+      expect(
+        (await invoke(f.projectId, f.context, [...args.slice(0, 4), 'stale', ...args.slice(5)]))
+          .exitCode
+      ).not.toBe(0)
+      const [updated] = await rows(f.projectId)
+      if (!updated) throw new Error('Updated file missing')
+      expect(await readFile(join(storageRoot, updated.key), 'utf8')).toBe('updated')
+    }
+  )
+
+  check(
+    'missing or incomplete registries and base64 inputs cannot publish unclassified content',
+    async () => {
+      const f = await fixture()
+      const incomplete = new ResolvedSecretTraceRegistry([], {
+        userId: f.userId,
+        workspaceId: f.workspaceId,
+      })
+      incomplete.markIncomplete('entry-decrypt-failed')
+      for (const registry of [undefined, incomplete]) {
+        const denied = await create(f.projectId, {
+          ...f.context,
+          resolvedSecretTraceRegistry: registry,
+        })
+        expect(denied.exitCode, denied.stderr).not.toBe(0)
+        expect(denied.stderr).toContain('provenance')
+        expect(await rows(f.projectId)).toEqual([])
+      }
+      expect((await create(f.projectId, f.context, 'cGxhaW4=', 'base64')).exitCode).not.toBe(0)
+      expect(await rows(f.projectId)).toEqual([])
+    }
+  )
+
+  check(
+    'known secrets including workspace redaction exemptions cannot be reclassified for a Project',
+    async () => {
+      const f = await fixture()
+      const secret = 'private-project-test-secret-value'
+      const { encrypted } = await encryptSecret(secret)
+      for (const unredacted of [false, true]) {
+        const registry = new ResolvedSecretTraceRegistry(
+          [
+            {
+              name: 'TOKEN',
+              plaintext: secret,
+              encryptedValue: encrypted,
+              scope: 'workspace',
+              ...(unredacted ? { unredacted: true as const } : {}),
+            },
+          ],
+          { userId: f.userId, workspaceId: f.workspaceId }
+        )
+        expect(registry.recordResolved('TOKEN', secret)).toBe(true)
+        const denied = await create(
+          f.projectId,
+          { ...f.context, resolvedSecretTraceRegistry: registry },
+          `notes ${secret}`
+        )
+        expect(denied.exitCode, denied.stderr).not.toBe(0)
+        expect(denied.stderr).toContain('provenance')
+        expect(await rows(f.projectId)).toEqual([])
+      }
+    }
+  )
+
+  for (const upload of [false, true]) {
+    for (const field of ['name', 'folderPath', 'contentType'] as const) {
+      check(
+        `a secret in Project ${upload ? 'upload' : 'create'} ${field} cannot escape as public metadata`,
+        async () => {
+          const f = await fixture()
+          const secret = 'synthetic-metadata-canary'
+          if (field === 'folderPath')
+            await db.insert(folder).values({
+              id: generateId(),
+              projectId: f.projectId,
+              resourceType: 'file',
+              name: secret,
+              userId: f.userId,
+            })
+          const registry = new ResolvedSecretTraceRegistry(
+            [
+              {
+                name: 'TOKEN',
+                plaintext: secret,
+                encryptedValue: (await encryptSecret(secret)).encrypted,
+                scope: 'workspace',
+              },
+            ],
+            { userId: f.userId, workspaceId: f.workspaceId }
+          )
+          expect(registry.recordResolved('TOKEN', secret)).toBe(true)
+          const transport = (
+            upload ? createProjectFileUploadTransport : createProjectFileWriteTransport
+          )({
+            endpoint: 'http://localhost:3200',
+            projectId: f.projectId,
+            context: { ...f.context, resolvedSecretTraceRegistry: registry },
+            fallback: async () => {
+              throw new Error('Unexpected fallback')
+            },
+          })
+          const response = await transport(
+            `http://localhost:3200/api/v2/projects/${f.projectId}/files${upload ? '/uploads' : ''}`,
+            {
+              method: 'POST',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({
+                name: 'safe.txt',
+                ...(upload ? { size: 9, contentType: 'text/plain' } : { content: 'safe body' }),
+                [field]:
+                  field === 'folderPath'
+                    ? `/${secret}`
+                    : field === 'contentType'
+                      ? `text/${secret}`
+                      : `${secret}.txt`,
+              }),
+            }
+          )
+          expect(response.status, await response.clone().text()).toBe(403)
+          expect(await rows(f.projectId)).toEqual([])
+          expect(
+            await db.select().from(uploadSession).where(eq(uploadSession.userId, f.userId))
+          ).toEqual([])
+        }
+      )
+    }
+  }
+
+  check('a private target cannot write a different Project', async () => {
+    const f = await fixture()
+    const other = await fixture()
+    expect(
+      (
+        await invoke(f.projectId, f.context, [
+          'create',
+          other.projectId,
+          '--name',
+          'bad.md',
+          '--content',
+          'plain',
+        ])
+      ).exitCode
+    ).not.toBe(0)
+    expect(await rows(other.projectId)).toEqual([])
+  })
+})
+
+describe.skipIf(!redisUrl)('Project workbench callback across requests', () => {
+  check(
+    'enforces live callback leases, binds uploads across requests and persists machine source history',
+    async () => {
+      const f = await fixture()
+      const chatId = generateId()
+      await db
+        .insert(copilotChats)
+        .values({ id: chatId, userId: f.userId, workspaceId: f.workspaceId, type: 'mothership' })
+      const token = generateId()
+      const otherToken = generateId()
+      const apiKey = generateId()
+      const sessionKey = chatSandboxSessionKey(chatId)
+      const machine = { providerId: 'e2b' as const, sandboxId: generateId() }
+      remoteSandboxProviderMockFns.mockResolveProvider.mockReturnValue({
+        id: machine.providerId,
+        findSessionSandbox: async () => ({ sandboxId: machine.sandboxId }),
+      })
+      const scope = {
+        toolCallId: generateId(),
+        runId: generateId(),
+        userId: f.userId,
+        ownerToken: generateId(),
+        chatId,
+        workspaceId: f.workspaceId,
+        apiKeyHash: sha256Hex(apiKey),
+        fileOwnerProtocolVersion: 1 as const,
+      }
+      await db.insert(copilotRuns).values({
+        id: scope.runId,
+        executionId: generateId(),
+        streamId: generateId(),
+        chatId,
+        userId: f.userId,
+        workspaceId: f.workspaceId,
+      })
+      await db.insert(copilotAsyncToolCalls).values({
+        runId: scope.runId,
+        toolCallId: scope.toolCallId,
+        toolName: 'run_code',
+        executionOwnerToken: scope.ownerToken,
+        executionStartedAt: new Date(),
+        executionLeaseExpiresAt: new Date(Date.now() + 60_000),
+      })
+      const redis = getRedisClient()
+      if (!redis) throw new Error('Expected integration Redis')
+      for (const leaseToken of [token, otherToken]) {
+        const prefix = `mothership:sandbox-resources:${leaseToken}`
+        callbackRedisKeys.push(`${prefix}:context`, `${prefix}:inbox`, `${prefix}:seen`)
+        await redis.set(`${prefix}:context`, JSON.stringify(scope), 'EX', 60)
+      }
+      const historyKey = `mothership:workbench-provenance:v2:${createHash('sha256')
+        .update(JSON.stringify([sessionKey, machine.providerId, machine.sandboxId]))
+        .digest('hex')}`
+      callbackRedisKeys.push(
+        historyKey,
+        `mothership:sandbox-resources:${token}:project-uploads:${f.projectId}`
+      )
+      await initializeSessionFileProvenance(sessionKey, machine)
+      const callback = (suffix: string, init?: RequestInit, callbackToken = token) => {
+        const path = `/api/mothership/sandbox/${callbackToken}/api/v2/projects/${f.projectId}/files${suffix}`
+        const headers = new Headers(init?.headers)
+        if (!headers.has('x-api-key')) headers.set('x-api-key', apiKey)
+        headers.set(
+          'x-mothership-file-owner',
+          JSON.stringify({ entityType: 'project', entityId: f.projectId })
+        )
+        return proxySandboxResourceRequest(
+          new Request(`http://localhost:3000${path}`, { ...init, headers }),
+          callbackToken
+        )
+      }
+      expect((await callback('', { headers: { 'x-api-key': generateId() } })).status).toBe(403)
+      const canary = 'synthetic-workbench-callback-canary'
+      const evidence = {
+        status: 'exact' as const,
+        entries: [
+          {
+            encryptedValue: (await encryptSecret(canary)).encrypted,
+            sourceUserId: f.userId,
+            sourceWorkspaceId: f.workspaceId,
+          },
+        ],
+      }
+      await recordSessionFileInput(sessionKey, machine, evidence)
+      const rejected = await callback('', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ name: 'unsafe.txt', content: canary, encoding: 'utf-8' }),
+      })
+      expect(rejected.status).toBe(403)
+      const safe = await callback('', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ name: 'safe.txt', content: 'safe text', encoding: 'utf-8' }),
+      })
+      expect(safe.status, await safe.clone().text()).toBe(201)
+      await db.insert(folder).values({
+        id: generateId(),
+        projectId: f.projectId,
+        resourceType: 'file',
+        name: canary,
+        userId: f.userId,
+      })
+      for (const metadata of [
+        { name: `${canary}.txt` },
+        { contentType: `text/${canary}` },
+        { folderPath: `/${canary}` },
+      ]) {
+        const denied = await callback('/uploads', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({
+            name: 'safe.txt',
+            contentType: 'text/plain',
+            size: 9,
+            ...metadata,
+          }),
+        })
+        expect(denied.status, await denied.clone().text()).toBe(403)
+        expect(
+          await db.select().from(uploadSession).where(eq(uploadSession.userId, f.userId))
+        ).toEqual([])
+      }
+      const bytes = Buffer.from('safe upload')
+      const createdResponse = await callback('/uploads', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ name: 'upload.txt', contentType: 'text/plain', size: bytes.length }),
+      })
+      expect(createdResponse.status, await createdResponse.clone().text()).toBe(201)
+      const created = v2CreateProjectFileUploadContract.response.schema.parse(
+        await createdResponse.json()
+      ).data
+      const upload = await verifyUploadSessionToken(created.uploadToken)
+      await writeLocalPutObject({
+        uploadId: upload.id,
+        key: upload.finalKey,
+        body: new ReadableStream({
+          start(controller) {
+            controller.enqueue(bytes)
+            controller.close()
+          },
+        }),
+        expectedSize: bytes.length,
+        contentType: upload.contentType,
+        metadata: uploadSessionObjectMetadata(upload),
+      })
+      const complete = { method: 'POST', headers: { 'upload-token': created.uploadToken } }
+      expect((await callback(`/uploads/${upload.id}/complete`, complete, otherToken)).status).toBe(
+        403
+      )
+      const beforeUnattributedUpload = await rows(f.projectId)
+      await recordSessionFileInput(sessionKey, machine, {
+        status: 'exact',
+        entries: [
+          { encryptedValue: (await encryptSecret('unattributed synthetic value')).encrypted },
+        ],
+      })
+      expect((await callback(`/uploads/${upload.id}/complete`, complete)).status).toBe(503)
+      expect(await rows(f.projectId)).toEqual(beforeUnattributedUpload)
+      await redis.del(historyKey)
+      await initializeSessionFileProvenance(sessionKey, machine)
+      await recordSessionFileInput(sessionKey, machine, evidence)
+      const response = await callback(`/uploads/${upload.id}/complete`, complete)
+      expect(response.status, await response.clone().text()).toBe(200)
+      const completed = v2CompleteProjectFileUploadContract.response.schema.parse(
+        await response.json()
+      ).data
+      if (!completed.file) throw new Error('Expected completed upload')
+      const [stored] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.id, completed.file.id))
+      const [provenance] = await db
+        .select()
+        .from(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, completed.file.id))
+      expect(stored).toMatchObject({ projectId: f.projectId, workspaceId: null, userId: f.userId })
+      expect(provenance).toMatchObject(evidence)
+      const freshMachine = { ...machine, sandboxId: generateId() }
+      remoteSandboxProviderMockFns.mockResolveProvider.mockReturnValue({
+        id: freshMachine.providerId,
+        findSessionSandbox: async () => ({ sandboxId: freshMachine.sandboxId }),
+      })
+      callbackRedisKeys.push(
+        `mothership:workbench-provenance:v2:${createHash('sha256')
+          .update(JSON.stringify([sessionKey, freshMachine.providerId, freshMachine.sandboxId]))
+          .digest('hex')}`
+      )
+      await initializeSessionFileProvenance(sessionKey, freshMachine)
+      expect(await readSessionSecretProvenance(sessionKey, freshMachine)).toEqual({
+        status: 'exact',
+        entries: [],
+      })
+      const read = await callback(`/${completed.file.id}/content`, undefined, otherToken)
+      expect(read.status).toBe(200)
+      expect(await read.text()).toBe('safe upload')
+      expect(await readSessionSecretProvenance(sessionKey, freshMachine)).toEqual(evidence)
+      const effects = (
+        await redis.lrange(`mothership:sandbox-resources:${token}:inbox`, 0, -1)
+      ).map((entry) => JSON.parse(entry))
+      expect(effects.length).toBeGreaterThan(0)
+      for (const effect of effects) {
+        expect(effect.resource.owner).toEqual({ entityType: 'project', entityId: f.projectId })
+        expect(effect.resource.workspaceId).toBeUndefined()
+      }
+      await db
+        .update(copilotAsyncToolCalls)
+        .set({ executionRevokedAt: new Date() })
+        .where(eq(copilotAsyncToolCalls.toolCallId, scope.toolCallId))
+      expect((await callback(`/${completed.file.id}/content`)).status).toBe(403)
+    }
+  )
+})
+
+afterAll(async () => {
+  if (callbackRedisKeys.length) await getRedisClient()?.del(...callbackRedisKeys)
+  for (const f of fixtures) {
+    await db.delete(uploadSession).where(eq(uploadSession.userId, f.userId))
+    await db
+      .delete(outboxEvent)
+      .where(sql`${outboxEvent.payload}::jsonb ->> 'key' LIKE ${`project/${f.projectId}/%`}`)
+    await db.delete(workspaceFiles).where(eq(workspaceFiles.projectId, f.projectId))
+    await db.delete(folder).where(eq(folder.projectId, f.projectId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, f.workspaceId))
+    if (f.originWorkspaceId && f.originWorkspaceId !== f.workspaceId)
+      await deleteWorkspaceFixture(db, eq(workspace.id, f.originWorkspaceId))
+    await db.delete(user).where(eq(user.id, f.userId))
+  }
+  await rm(storageRoot, { recursive: true, force: true })
+  const report =
+    process.env.PROJECT_FILE_WRITE_TRANSPORT_REPORT_PATH ??
+    'test-results/project-file-write-transport.json'
+  await mkdir(dirname(report), { recursive: true })
+  await writeFile(report, JSON.stringify({ checks }, null, 2))
+  await closeRedisConnection()
+  await db.$client.end()
+})
diff --git a/apps/sim/lib/mothership/agent-cli/project-file-write-transport.ts b/apps/sim/lib/mothership/agent-cli/project-file-write-transport.ts
new file mode 100644
index 00000000000..0d479a1557e
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-file-write-transport.ts
@@ -0,0 +1,156 @@
+import { createLogger } from '@sim/logger'
+import { NextRequest } from 'next/server'
+import {
+  v2CreateProjectFileContract,
+  v2UpdateProjectFileContentContract,
+} from '@/lib/api/contracts/v2/project-files'
+import { matchV2Route } from '@/lib/api/server/routes/in-process-transport'
+import {
+  V2_PARSE_DEFAULTS,
+  v2InvalidBodyResponse,
+  v2OrchestrationErrorPolicy,
+} from '@/lib/api/server/routes/v2-json-route'
+import { parseRequest } from '@/lib/api/server/validation'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { requireCleanProjectFileMetadata } from '@/lib/mothership/agent-cli/project-file-write-provenance'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import { requireTrustedCopilotResourceExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import { toV2ProjectFile } from '@/lib/projects/files/api/presenters'
+import { createProjectFile, updateProjectFileContent } from '@/lib/projects/files/application'
+import { EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+import { getFileExtension, getMimeTypeFromExtension } from '@/lib/uploads/utils/file-utils'
+import { MAX_WORKSPACE_FILE_INLINE_BODY_BYTES } from '@/lib/workspace-files/orchestration'
+import { v2Data, v2Error } from '@/app/api/v2/lib/response'
+import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const logger = createLogger('ProjectFileWriteTransport')
+
+/** Private inline writes carry only a proven empty classification; original source identities are never reconstructed. */
+export function createProjectFileWriteTransport(options: {
+  endpoint: string
+  projectId: string
+  context: AgentCliExecutionContext
+  fallback: typeof fetch
+  resolveSecretTraceRegistry?: () => Promise<ResolvedSecretTraceRegistry>
+}): typeof fetch {
+  const origin = new URL(options.endpoint).origin
+  const projectId = options.projectId
+  return async (input, init) => {
+    const originalRequest = new Request(input, init)
+    const url = new URL(originalRequest.url)
+    let matched: ReturnType<typeof matchV2Route>
+    try {
+      matched = matchV2Route(url.pathname)
+    } catch {
+      return v2Error('BAD_REQUEST', 'CLI target is unavailable')
+    }
+    if (url.origin !== origin || !matched || matched.params.projectId !== projectId)
+      return v2Error('BAD_REQUEST', 'CLI target is unavailable')
+    const create =
+      originalRequest.method === 'POST' && matched.pattern === '/api/v2/projects/{projectId}/files'
+    const update =
+      originalRequest.method === 'PUT' &&
+      matched.pattern === '/api/v2/projects/{projectId}/files/{fileId}/content'
+    if (!create && !update) return options.fallback(originalRequest)
+    const request = new NextRequest(originalRequest)
+    try {
+      requireTrustedCopilotResourceExecutionContext(options.context)
+    } catch {
+      return v2Error('FORBIDDEN', 'Project file authority is unavailable')
+    }
+    const parseOptions = {
+      ...V2_PARSE_DEFAULTS,
+      maxBodyBytes: MAX_WORKSPACE_FILE_INLINE_BODY_BYTES,
+      invalidJsonResponse: () => v2InvalidBodyResponse(request),
+    }
+    try {
+      options.context.signal?.throwIfAborted()
+      request.signal.throwIfAborted()
+      if (create) {
+        const parsed = await parseRequest(
+          v2CreateProjectFileContract,
+          request,
+          { params: matched.params },
+          parseOptions
+        )
+        if (!parsed.success) return parsed.response
+        const { params, body } = parsed.data
+        await requireCleanInlineText(body, options)
+        options.context.signal?.throwIfAborted()
+        request.signal.throwIfAborted()
+        const result = await executeCopilotProjectFileUseCase(
+          options.context,
+          createProjectFile,
+          {
+            projectId: params.projectId,
+            name: body.name,
+            contentType: body.contentType ?? getMimeTypeFromExtension(getFileExtension(body.name)),
+            content: body.content,
+            encoding: body.encoding,
+            folderPath: body.folderPath ?? '/',
+            exactName: true,
+            secretProvenance: EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE,
+          },
+          { projectId }
+        )
+        const response = v2CreateProjectFileContract.response.schema.parse({
+          data: toV2ProjectFile(result.file),
+        })
+        return v2Data(response.data, { status: v2CreateProjectFileContract.response.status })
+      }
+      const parsed = await parseRequest(
+        v2UpdateProjectFileContentContract,
+        request,
+        { params: matched.params },
+        parseOptions
+      )
+      if (!parsed.success) return parsed.response
+      const { params, body } = parsed.data
+      await requireCleanInlineText(body, options)
+      options.context.signal?.throwIfAborted()
+      request.signal.throwIfAborted()
+      const target = { projectId, fileId: params.fileId }
+      const result = await executeCopilotProjectFileUseCase(
+        options.context,
+        updateProjectFileContent,
+        {
+          ...target,
+          content: body.content,
+          encoding: body.encoding,
+          expectedRevision: body.expectedRevision,
+          secretProvenance: EXACT_EMPTY_WORKSPACE_FILE_SECRET_PROVENANCE,
+        },
+        target
+      )
+      const response = v2UpdateProjectFileContentContract.response.schema.parse({
+        data: toV2ProjectFile(result.file),
+      })
+      return v2Data(response.data)
+    } catch (error) {
+      options.context.signal?.throwIfAborted()
+      request.signal.throwIfAborted()
+      const response = v2OrchestrationErrorPolicy.render(error)
+      if (response) return response
+      logger.error('Project file write failed', { error })
+      return v2Error('INTERNAL_ERROR', 'Project file write could not be completed')
+    }
+  }
+}
+
+async function requireCleanInlineText(
+  body: { content: string; encoding: 'utf-8' | 'base64' },
+  options: {
+    context: AgentCliExecutionContext
+    resolveSecretTraceRegistry?: () => Promise<ResolvedSecretTraceRegistry>
+  }
+): Promise<void> {
+  const { context } = options
+  context.signal?.throwIfAborted()
+  if (body.encoding !== 'utf-8')
+    throw new OrchestrationError(
+      'forbidden',
+      'Project CLI writes currently require UTF-8 text with verified secret provenance'
+    )
+  await requireCleanProjectFileMetadata(body, options)
+}
diff --git a/apps/sim/lib/mothership/agent-cli/project-files.ts b/apps/sim/lib/mothership/agent-cli/project-files.ts
new file mode 100644
index 00000000000..176270907f7
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/project-files.ts
@@ -0,0 +1,93 @@
+import type { EmbeddedCliIdentity } from 'sim/embed'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { executePreparedCliRequest } from '@/lib/mothership/agent-cli/execute'
+import { grepProjectFiles } from '@/lib/mothership/agent-cli/project-file-grep'
+import { importProjectFileProvenance } from '@/lib/mothership/agent-cli/project-file-provenance'
+import { readProjectFileForAgent } from '@/lib/mothership/agent-cli/project-file-read'
+import { createProjectFileCliTransport } from '@/lib/mothership/agent-cli/project-file-transport'
+import { createProjectFileUploadTransport } from '@/lib/mothership/agent-cli/project-file-upload-transport'
+import { createProjectFileWriteTransport } from '@/lib/mothership/agent-cli/project-file-write-transport'
+import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
+import { createTracedCliTransport } from '@/lib/mothership/agent-cli/traced-transport'
+import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import type { AgentCliRawResult, AgentCliRequest } from '@/lib/mothership/generated/agent-cli'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+import { getProjectFileCapabilities } from '@/lib/projects/files/application'
+import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+import { observeWorkspaceFileDelivery } from '@/lib/workspace-files/application/file-delivery-observer'
+import { v2Error } from '@/app/api/v2/lib/response'
+
+/** Executes the native command tree with Project-only transport and no ambient workspace target. */
+export async function executeProjectFileCliRequest(
+  request: AgentCliRequest,
+  context: AgentCliExecutionContext,
+  projectId: string
+): Promise<AgentCliRawResult> {
+  const { invocation } = request
+  if (invocation.kind === 'service')
+    throw new OrchestrationError('validation', 'This Project file operation is not supported')
+  if (request.curate)
+    throw new OrchestrationError(
+      'validation',
+      'Project file commands do not support this projection'
+    )
+  const target = { projectId }
+  await executeCopilotProjectFileUseCase(context, getProjectFileCapabilities, target, target)
+  const endpoint = getInternalApiBaseUrl()
+  const sessionKey = context.chatId ? chatSandboxSessionKey(context.chatId) : null
+  const files = sessionKey ? createWorkbenchFileProvenance({ ...context, sessionKey }) : undefined
+  const scoped = createProjectFileUploadTransport({
+    endpoint,
+    projectId,
+    context,
+    uploadProvenance: files?.uploadProvenance,
+    fallback: createProjectFileWriteTransport({
+      endpoint,
+      projectId,
+      context,
+      fallback: createProjectFileCliTransport(endpoint, context, target),
+    }),
+  })
+  const observed: typeof fetch = async (input, init) => {
+    let provenance: WorkspaceFileSecretProvenance | undefined
+    const response = await observeWorkspaceFileDelivery(
+      async (source) => {
+        provenance = source
+        await importProjectFileProvenance(context.resolvedSecretTraceRegistry, source)
+      },
+      () => scoped(input, init)
+    )
+    if (response.ok && response.headers.has('Content-Disposition') && !provenance) {
+      await response.body?.cancel()
+      return v2Error('SERVICE_UNAVAILABLE', 'File read provenance is unavailable. Retry the read.')
+    }
+    if (response.body && provenance) files?.trackDownload(response.body, provenance)
+    return response
+  }
+  const resources: ResourceChange[] = []
+  const identity: EmbeddedCliIdentity = {
+    endpoint,
+    apiKey: 'mothership-in-process',
+    transport: createResourceEffectTransport(
+      endpoint,
+      createTracedCliTransport(endpoint, observed),
+      resources,
+      true
+    ),
+    ...(context.signal ? { signal: context.signal } : {}),
+  }
+  return executePreparedCliRequest(request, {
+    identity,
+    sessionKey,
+    files,
+    resources,
+    augment: (invocation) =>
+      invocation.name === 'grep'
+        ? grepProjectFiles(invocation, context, projectId)
+        : readProjectFileForAgent(invocation, context, projectId),
+  })
+}
diff --git a/apps/sim/lib/mothership/agent-cli/resource-effects.ts b/apps/sim/lib/mothership/agent-cli/resource-effects.ts
index de1ddb069a1..98610839af6 100644
--- a/apps/sim/lib/mothership/agent-cli/resource-effects.ts
+++ b/apps/sim/lib/mothership/agent-cli/resource-effects.ts
@@ -2,6 +2,7 @@ import type { z } from 'zod'
 import type { AnyApiRouteContract } from '@/lib/api/contracts/types'
 import * as credentials from '@/lib/api/contracts/v2/credentials'
 import * as customTools from '@/lib/api/contracts/v2/custom-tools'
+import { v2CopyFileItemsContract } from '@/lib/api/contracts/v2/file-copy'
 import * as files from '@/lib/api/contracts/v2/files'
 import * as knowledge from '@/lib/api/contracts/v2/knowledge'
 import * as chunks from '@/lib/api/contracts/v2/knowledge-chunks'
@@ -9,13 +10,18 @@ import * as tags from '@/lib/api/contracts/v2/knowledge-tags'
 import * as logs from '@/lib/api/contracts/v2/logs'
 import * as logStats from '@/lib/api/contracts/v2/logs-stats'
 import * as mcpServers from '@/lib/api/contracts/v2/mcp-servers'
+import { v2UnzipProjectFileContract } from '@/lib/api/contracts/v2/project-file-extraction'
+import { v2CompleteProjectFileUploadContract } from '@/lib/api/contracts/v2/project-file-uploads'
+import * as projectFiles from '@/lib/api/contracts/v2/project-files'
 import * as sandboxes from '@/lib/api/contracts/v2/sandboxes'
 import * as secrets from '@/lib/api/contracts/v2/secrets'
 import * as tables from '@/lib/api/contracts/v2/tables'
 import * as workflows from '@/lib/api/contracts/v2/workflows'
-import { parseFolderPath } from '@/lib/folders/paths'
+import { buildFolderPath, parseFolderPath } from '@/lib/folders/paths'
 import type { ResourceAddress, ResourceChange } from '@/lib/mothership/generated/resources'
 import { encodeVfsPathSegments } from '@/lib/vfs/path'
+import { parseWorkspaceFileFolderDisplayPath } from '@/lib/workspace-files/folder-display-path'
+import { fileOwnerVfsPath } from '@/lib/workspace-files/owner-paths'
 
 interface EffectContext {
   params: Record<string, string>
@@ -38,7 +44,7 @@ function refresh(type: ResourceKind, id?: string): ResourceChange[] {
 
 function upsert(
   type: ResourceKind,
-  value: { id: string; name?: string; folderPath?: string },
+  value: { id: string; name?: string; folderPath?: string; owner?: ResourceAddress['owner'] },
   readOnly = false
 ): ResourceChange[] {
   return [
@@ -48,10 +54,16 @@ function upsert(
       resource: {
         type,
         id: value.id,
+        ...(value.owner ? { owner: value.owner } : {}),
         ...(value.name ? { title: value.name } : {}),
         ...(type === 'file' && value.name && value.folderPath !== undefined
           ? {
-              path: `files/${encodeVfsPathSegments([...parseFolderPath(value.folderPath), value.name])}`,
+              path: value.owner
+                ? fileOwnerVfsPath(
+                    value.owner,
+                    `files/${encodeVfsPathSegments([...parseFolderPath(value.folderPath), value.name])}`
+                  )
+                : `files/${encodeVfsPathSegments([...parseFolderPath(value.folderPath), value.name])}`,
             }
           : {}),
       },
@@ -144,6 +156,48 @@ function settingsMutations(
 }
 
 const EFFECT_ROUTES: EffectRoute[] = [
+  after(v2UnzipProjectFileContract, (_result, { params }) => [
+    {
+      op: 'refresh',
+      resource: { type: 'file', owner: { entityType: 'project', entityId: params.projectId } },
+    },
+    {
+      op: 'refresh',
+      resource: {
+        type: 'filefolder',
+        owner: { entityType: 'project', entityId: params.projectId },
+      },
+    },
+  ]),
+  after(v2CompleteProjectFileUploadContract, ({ data }) =>
+    data.file ? upsert('file', data.file) : []
+  ),
+  after(v2CopyFileItemsContract, ({ data }) => [
+    ...data.files.flatMap((file) =>
+      upsert('file', {
+        ...file,
+        folderPath: buildFolderPath(
+          file.folderPath ? parseWorkspaceFileFolderDisplayPath(file.folderPath) : []
+        ),
+      })
+    ),
+    ...(data.folders[0]
+      ? [
+          {
+            op: 'refresh' as const,
+            resource: { type: 'filefolder' as const, owner: data.folders[0].owner },
+          },
+        ]
+      : []),
+  ]),
+  {
+    ...after(projectFiles.v2GetProjectFileMetadataContract, ({ data }) =>
+      upsert('file', data, true)
+    ),
+    readOnly: true,
+  },
+  after(projectFiles.v2CreateProjectFileContract, ({ data }) => upsert('file', data)),
+  after(projectFiles.v2UpdateProjectFileContentContract, ({ data }) => upsert('file', data)),
   ...settingsMutations('secrets', [secrets.v2SetSecretContract, secrets.v2DeleteSecretContract]),
   ...settingsMutations('credentials', [
     credentials.v2CreateCredentialConnectionContract,
diff --git a/apps/sim/lib/mothership/agent-cli/scoped-transport.ts b/apps/sim/lib/mothership/agent-cli/scoped-transport.ts
index 70af6276439..59badd8cc3f 100644
--- a/apps/sim/lib/mothership/agent-cli/scoped-transport.ts
+++ b/apps/sim/lib/mothership/agent-cli/scoped-transport.ts
@@ -1,21 +1,46 @@
 import { NextRequest } from 'next/server'
 import { markCopilotRequest } from '@/lib/api/server/routes/copilot-request'
-import { dispatchInProcessV2Request } from '@/lib/api/server/routes/in-process-transport'
+import {
+  dispatchInProcessV2Request,
+  matchV2Route,
+} from '@/lib/api/server/routes/in-process-transport'
 import type { CopilotChatDelegationContext } from '@/lib/mothership/auth/application-delegation'
 
+interface ScopedCliInvocation {
+  admitRequest(
+    request: NextRequest,
+    route: NonNullable<ReturnType<typeof matchV2Route>>
+  ): Response | undefined | Promise<Response | undefined>
+}
+
 /** Private admission uses only this validated in-process identity; public requests remain API-key authenticated. */
 export function createScopedCliTransport(
   endpoint: string,
-  invocation: CopilotChatDelegationContext
+  invocation: CopilotChatDelegationContext | ScopedCliInvocation
 ): typeof fetch {
   const origin = new URL(endpoint).origin
+  const scope = Object.freeze({ ...invocation })
   return async (input, init) => {
     const request = new Request(input, init)
     const url = new URL(request.url)
     if (url.origin !== origin || !url.pathname.startsWith('/api/v2/'))
       return Response.json({ error: 'CLI target is unavailable' }, { status: 400 })
     const forwarded = new NextRequest(request)
-    markCopilotRequest(forwarded, invocation)
+    if ('admitRequest' in scope) {
+      let matched: ReturnType<typeof matchV2Route>
+      try {
+        matched = matchV2Route(url.pathname)
+      } catch {
+        return Response.json({ error: 'CLI target is unavailable' }, { status: 400 })
+      }
+      if (!matched) {
+        return Response.json({ error: 'CLI target is unavailable' }, { status: 400 })
+      }
+      const denied = await scope.admitRequest(forwarded, matched)
+      if (denied) return denied
+    } else {
+      markCopilotRequest(forwarded, scope)
+    }
     return (
       (await dispatchInProcessV2Request(forwarded)) ??
       Response.json({ error: 'API route or method unavailable' }, { status: 404 })
diff --git a/apps/sim/lib/mothership/agent-cli/services.ts b/apps/sim/lib/mothership/agent-cli/services.ts
index b783f5a01f1..fe930f88964 100644
--- a/apps/sim/lib/mothership/agent-cli/services.ts
+++ b/apps/sim/lib/mothership/agent-cli/services.ts
@@ -36,12 +36,16 @@ export async function executeAgentCliService(
   const invocation = request.invocation
   if (invocation.kind !== 'service' && invocation.kind !== 'stdout')
     throw new OrchestrationError('validation', 'Invalid service invocation')
+  if (request.fileOwner)
+    throw new OrchestrationError('validation', 'Service invocations do not take a file owner')
   const scope =
-    invocation.kind === 'service' && invocation.name === 'settings'
-      ? invocation.input.scope
-      : invocation.kind === 'service' && invocation.name === 'dashboards'
-        ? 'workspace'
-        : 'organization'
+    invocation.kind === 'service' && invocation.name === 'list_user_projects'
+      ? 'account'
+      : invocation.kind === 'service' && invocation.name === 'settings'
+        ? invocation.input.scope
+        : invocation.kind === 'service' && invocation.name === 'dashboards'
+          ? 'workspace'
+          : 'organization'
   if (
     invocation.kind === 'service' &&
     invocation.name !== 'list_workspaces' &&
diff --git a/apps/sim/lib/mothership/agent-cli/workspace.ts b/apps/sim/lib/mothership/agent-cli/workspace.ts
new file mode 100644
index 00000000000..64814f479f1
--- /dev/null
+++ b/apps/sim/lib/mothership/agent-cli/workspace.ts
@@ -0,0 +1,178 @@
+import { createEmbeddedClient, type EmbeddedCliIdentity } from 'sim/embed'
+import { withWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope'
+import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { curateBlockDetail } from '@/lib/mothership/agent-cli/curation'
+import { AUGMENTATION_ENGINES, runEngine } from '@/lib/mothership/agent-cli/engines'
+import { executePreparedCliRequest } from '@/lib/mothership/agent-cli/execute'
+import { createFileReadTransport } from '@/lib/mothership/agent-cli/file-read-transport'
+import { createFileUploadTransport } from '@/lib/mothership/agent-cli/file-upload-transport'
+import { curateKnowledgeDocuments } from '@/lib/mothership/agent-cli/knowledge-curation'
+import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
+import { createScopedCliTransport } from '@/lib/mothership/agent-cli/scoped-transport'
+import { createTableReadTransport } from '@/lib/mothership/agent-cli/table-read-transport'
+import { createTracedCliTransport } from '@/lib/mothership/agent-cli/traced-transport'
+import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
+import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
+import {
+  COPILOT_APPLICATION_DELEGATION_TTL_MS,
+  createCopilotChatPrincipal,
+  createTrustedOrganizationCopilotPrincipal,
+} from '@/lib/mothership/auth/application-delegation'
+import type { AgentCliRawResult, AgentCliRequest } from '@/lib/mothership/generated/agent-cli'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import { TraceSpan } from '@/lib/mothership/generated/trace-spans-v1'
+import { withCopilotSpan } from '@/lib/mothership/request/otel'
+import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+import { WORKSPACE_FILES_DELEGATION_AUDIENCE } from '@/lib/workspace-files/application/authorization'
+
+/** Resolves workspace policy before preparing the existing workspace CLI transport. */
+export async function executeWorkspaceCliRequest(
+  request: AgentCliRequest,
+  context: AgentCliExecutionContext,
+  workspaceId = request.workspaceId
+): Promise<AgentCliRawResult> {
+  const target = await resolveInvocationWorkspace(context, workspaceId)
+  return withWorkspaceInvocationScope(
+    {
+      workspaceId: target.workspaceId,
+      organizationId: context.chatOrganizationId ?? context.organizationId,
+    },
+    () =>
+      executeBoundAgentCliRequest(request, {
+        ...context,
+        ...target,
+        chatOrganizationId: context.chatOrganizationId ?? context.organizationId,
+      })
+  )
+}
+
+async function executeBoundAgentCliRequest(
+  request: AgentCliRequest,
+  context: AgentCliExecutionContext & { workspaceId: string }
+): Promise<AgentCliRawResult> {
+  /** The embedded client's required credential is opaque and never valid on the public API. */
+  const apiKey = 'mothership-in-process'
+  const invocationIdentity = {
+    userId: context.userId,
+    workspaceId: context.workspaceId,
+    chatId: context.chatId,
+  }
+  const endpoint = getInternalApiBaseUrl()
+  const sessionKey = context.chatId ? chatSandboxSessionKey(context.chatId) : null
+  const files = sessionKey ? createWorkbenchFileProvenance({ ...context, sessionKey }) : undefined
+  const reads = createFileReadTransport({
+    endpoint,
+    transport: createTableReadTransport({
+      endpoint,
+      transport: createTracedCliTransport(
+        endpoint,
+        createScopedCliTransport(endpoint, invocationIdentity)
+      ),
+      registry: context.resolvedSecretTraceRegistry,
+    }),
+    userId: context.userId,
+    invocation: invocationIdentity,
+    registry: context.resolvedSecretTraceRegistry,
+    ...(context.chatId !== undefined ? { chatId: context.chatId } : {}),
+    ...(files ? { trackDownload: files.trackDownload } : {}),
+  })
+  const resources: ResourceChange[] = []
+  const identity: EmbeddedCliIdentity = {
+    endpoint,
+    apiKey,
+    workspaceId: context.workspaceId,
+    transport: createResourceEffectTransport(
+      endpoint,
+      files
+        ? createFileUploadTransport({
+            endpoint,
+            workspaceId: context.workspaceId,
+            userId: context.userId,
+            invocation: invocationIdentity,
+            fallback: reads,
+            uploadProvenance: files.uploadProvenance,
+          })
+        : reads,
+      resources,
+      request.invocation.kind === 'cli' ||
+        (request.invocation.kind === 'augmentation' &&
+          AUGMENTATION_ENGINES[request.invocation.name]?.openReadResources === true)
+    ),
+    ...(context.signal ? { signal: context.signal } : {}),
+  }
+
+  return executePreparedCliRequest(request, {
+    identity,
+    sessionKey,
+    files,
+    resources,
+    augment: (invocation) =>
+      runEngine(
+        invocation.name,
+        invocation.positionals,
+        {
+          client: createEmbeddedClient(identity),
+          workspaceId: context.workspaceId,
+          userId: context.userId,
+          principal: createCopilotChatPrincipal(
+            invocationIdentity,
+            WORKSPACE_FILES_DELEGATION_AUDIENCE
+          ),
+          invocation: invocationIdentity,
+          ...(context.chatOrganizationId && context.chatId
+            ? {
+                chatOrganizationId: context.chatOrganizationId,
+                chatPrincipal: createTrustedOrganizationCopilotPrincipal(
+                  {
+                    userId: context.userId,
+                    organizationId: context.chatOrganizationId,
+                    chatId: context.chatId,
+                    delegationId: `scratch:${context.chatId}`,
+                  },
+                  {
+                    audience: WORKSPACE_FILES_DELEGATION_AUDIENCE,
+                    ttlMs: COPILOT_APPLICATION_DELEGATION_TTL_MS,
+                  }
+                ),
+              }
+            : {}),
+          ...(context.chatId !== undefined ? { chatId: context.chatId } : {}),
+          signal: context.signal,
+        },
+        invocation.flags
+      ),
+    async curate(result) {
+      if (request.curate === 'knowledge-documents') return curateKnowledgeDocuments(result)
+      if (result.exitCode === 0 && request.curate === 'block') {
+        return withCopilotSpan(TraceSpan.CopilotCliCurate, undefined, () =>
+          curateBlockDetail(result, context)
+        )
+      }
+      return result
+    },
+    projectResources: (changes) => {
+      function scopeResource<R extends ResourceChange['resource']>(resource: R): R {
+        return {
+          ...resource,
+          ...(request.fileOwner && ['file', 'filefolder'].includes(resource.type)
+            ? { owner: request.fileOwner }
+            : {}),
+          ...(context.chatOrganizationId ? { workspaceId: context.workspaceId } : {}),
+        }
+      }
+      return changes.map((effect) => {
+        switch (effect.op) {
+          case 'upsert':
+            return { ...effect, resource: scopeResource(effect.resource) }
+          case 'remove':
+            return { ...effect, resource: scopeResource(effect.resource) }
+          case 'refresh':
+            return { ...effect, resource: scopeResource(effect.resource) }
+          case 'clear_view':
+            return { ...effect, resource: scopeResource(effect.resource) }
+        }
+      })
+    },
+  })
+}
diff --git a/apps/sim/lib/mothership/application/application-adapter.ts b/apps/sim/lib/mothership/application/application-adapter.ts
index e582517dc32..8cb077e506c 100644
--- a/apps/sim/lib/mothership/application/application-adapter.ts
+++ b/apps/sim/lib/mothership/application/application-adapter.ts
@@ -1,5 +1,11 @@
-import type { DelegatedPrincipal } from '@sim/auth/principal'
+import type {
+  DelegatedPrincipal,
+  Principal,
+  ResourceDelegatedPrincipal,
+  ResourceDelegationScope,
+} from '@sim/auth/principal'
 import {
+  type ApplicationOperation,
   type OperationUseCase,
   requireAllowedWorkspacePrincipal,
   type WorkspaceOperation,
@@ -7,10 +13,14 @@ import {
 import {
   type CopilotDelegationConfiguration,
   type CopilotExecutionContext,
+  type CopilotResourceDelegationConfiguration,
   type CopilotResourceScope,
   createCopilotApplicationPrincipal,
+  createCopilotResourceApplicationPrincipal,
   requireTrustedCopilotExecutionContext,
+  requireTrustedCopilotResourceExecutionContext,
   type TrustedCopilotExecutionContext,
+  type TrustedCopilotResourceExecutionContext,
 } from '@/lib/mothership/auth/application-delegation'
 
 type CopilotApplicationPrincipalFactory = (args: {
@@ -19,6 +29,7 @@ type CopilotApplicationPrincipalFactory = (args: {
 }) => DelegatedPrincipal
 
 interface CopilotApplicationAdapterOptions<O extends WorkspaceOperation, ScopeInput = undefined> {
+  mode?: 'workspace'
   domain: string
   delegation: CopilotDelegationConfiguration
   operations: Readonly<Record<string, O>>
@@ -29,8 +40,44 @@ interface CopilotApplicationAdapterOptions<O extends WorkspaceOperation, ScopeIn
   createPrincipal?: CopilotApplicationPrincipalFactory
 }
 
+interface CopilotResourceOperation extends ApplicationOperation {
+  readonly principalKinds: readonly Principal['kind'][]
+  readonly delegatedServices?: readonly ResourceDelegatedPrincipal['serviceId'][]
+  readonly delegationAudience?: string
+}
+
+type CopilotResourceAdapterOptions<O extends CopilotResourceOperation, ScopeInput = undefined> = {
+  mode: 'resource'
+  domain: string
+  delegation: CopilotResourceDelegationConfiguration
+  operations: Readonly<Record<string, O>>
+} & (
+  | {
+      resourceScope: ResourceDelegationScope
+      projectResourceScope?: never
+    }
+  | {
+      resourceScope?: never
+      projectResourceScope(
+        input: ScopeInput,
+        context: TrustedCopilotResourceExecutionContext
+      ): ResourceDelegationScope
+    }
+)
+
 type ScopeArguments<ScopeInput> = [ScopeInput] extends [undefined] ? [] : [scope: ScopeInput]
 
+type CopilotApplicationExecutor<O extends ApplicationOperation, ScopeInput> = <
+  Selected extends O,
+  I,
+  R,
+>(
+  context: CopilotExecutionContext | undefined,
+  useCase: OperationUseCase<Selected, I, R>,
+  input: I,
+  ...scopeArguments: ScopeArguments<ScopeInput>
+) => Promise<R>
+
 const RESOURCE_SCOPE_KEYS = ['fileId', 'tableId', 'chatId', 'executionId'] as const
 
 function requireValidProjectedResourceScope(resourceScope: CopilotResourceScope): void {
@@ -90,11 +137,11 @@ function requireMatchingPrincipal(
   }
 }
 
-/** Adapts trusted Copilot calls to a domain's existing application use cases. */
-export function createCopilotApplicationAdapter<
-  O extends WorkspaceOperation,
-  ScopeInput = undefined,
->(options: CopilotApplicationAdapterOptions<O, ScopeInput>) {
+function registeredCopilotOperations<O extends ApplicationOperation>(options: {
+  domain: string
+  delegation: { audience: string; ttlMs: number }
+  operations: Readonly<Record<string, O>>
+}): Set<O> {
   if (!options.domain.trim()) throw new Error('Copilot application adapter requires a domain')
   if (!options.delegation.audience.trim()) {
     throw new Error('Copilot application adapter requires a delegation audience')
@@ -117,7 +164,13 @@ export function createCopilotApplicationAdapter<
     }
     operationIds.add(operation.id)
   }
-  const registeredOperations = new Set<O>(operations)
+  return new Set<O>(operations)
+}
+
+function createWorkspaceApplicationAdapter<O extends WorkspaceOperation, ScopeInput>(
+  options: CopilotApplicationAdapterOptions<O, ScopeInput>
+): CopilotApplicationExecutor<O, ScopeInput> {
+  const registeredOperations = registeredCopilotOperations(options)
 
   return function executeCopilotApplicationUseCase<Selected extends O, I, R>(
     context: CopilotExecutionContext | undefined,
@@ -153,3 +206,68 @@ export function createCopilotApplicationAdapter<
     return useCase.execute({ principal, input })
   }
 }
+
+function createResourceApplicationAdapter<O extends CopilotResourceOperation, ScopeInput>(
+  options: CopilotResourceAdapterOptions<O, ScopeInput>
+): CopilotApplicationExecutor<O, ScopeInput> {
+  const registeredOperations = registeredCopilotOperations(options)
+  return function executeCopilotResourceUseCase<Selected extends O, I, R>(
+    context: CopilotExecutionContext | undefined,
+    useCase: OperationUseCase<Selected, I, R>,
+    input: I,
+    ...scopeArguments: ScopeArguments<ScopeInput>
+  ): Promise<R> {
+    if (!registeredOperations.has(useCase.operation)) {
+      throw new Error(`Unregistered Copilot ${options.domain} operation: ${useCase.operation.id}`)
+    }
+    const operation = useCase.operation
+    if (
+      !operation.principalKinds.includes('resource_delegated') ||
+      !operation.delegatedServices?.includes('copilot')
+    ) {
+      throw new Error(`Operation ${operation.id} does not admit Copilot resource delegation`)
+    }
+    if (operation.delegationAudience !== options.delegation.audience) {
+      throw new Error(`Operation ${operation.id} has a different delegation audience`)
+    }
+    const trustedContext = requireTrustedCopilotResourceExecutionContext(context)
+    let scope: ResourceDelegationScope
+    if (options.projectResourceScope) {
+      if (scopeArguments.length !== 1) {
+        throw new Error(`Copilot ${options.domain} execution requires trusted scope input`)
+      }
+      scope = options.projectResourceScope(scopeArguments[0], trustedContext)
+    } else {
+      if (scopeArguments.length !== 0) {
+        throw new Error(`Copilot ${options.domain} execution does not accept resource scope input`)
+      }
+      scope = options.resourceScope
+    }
+    const principal = createCopilotResourceApplicationPrincipal(trustedContext, {
+      ...options.delegation,
+      scope,
+    })
+    return useCase.execute({ principal, input })
+  }
+}
+
+/** Adapts admitted Copilot calls to registered operations without changing their owner policy. */
+export function createCopilotApplicationAdapter<
+  O extends CopilotResourceOperation,
+  ScopeInput = undefined,
+>(options: CopilotResourceAdapterOptions<O, ScopeInput>): CopilotApplicationExecutor<O, ScopeInput>
+export function createCopilotApplicationAdapter<
+  O extends WorkspaceOperation,
+  ScopeInput = undefined,
+>(
+  options: CopilotApplicationAdapterOptions<O, ScopeInput>
+): CopilotApplicationExecutor<O, ScopeInput>
+export function createCopilotApplicationAdapter<ScopeInput = undefined>(
+  options:
+    | CopilotApplicationAdapterOptions<WorkspaceOperation, ScopeInput>
+    | CopilotResourceAdapterOptions<CopilotResourceOperation, ScopeInput>
+) {
+  return options.mode === 'resource'
+    ? createResourceApplicationAdapter(options)
+    : createWorkspaceApplicationAdapter(options)
+}
diff --git a/apps/sim/lib/mothership/application/execute-project-file-use-case.ts b/apps/sim/lib/mothership/application/execute-project-file-use-case.ts
new file mode 100644
index 00000000000..78dcd0cc786
--- /dev/null
+++ b/apps/sim/lib/mothership/application/execute-project-file-use-case.ts
@@ -0,0 +1,20 @@
+import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter'
+import { projectFileOperations } from '@/lib/projects/files/application'
+import { PROJECT_FILE_DELEGATION_TTL_MS } from '@/lib/projects/files/application/operations'
+
+export const executeCopilotProjectFileUseCase = createCopilotApplicationAdapter({
+  mode: 'resource',
+  domain: 'project files',
+  operations: projectFileOperations,
+  projectResourceScope: (target: { projectId: string; fileId?: string }) => ({
+    kind: 'entity',
+    entityType: 'project',
+    entityId: target.projectId,
+    ...(target.fileId ? { fileId: target.fileId } : {}),
+  }),
+  delegation: {
+    audience: projectFileOperations.list.delegationAudience,
+    ttlMs: PROJECT_FILE_DELEGATION_TTL_MS,
+    createDelegationId: (context) => context.toolCallId,
+  },
+})
diff --git a/apps/sim/lib/mothership/application/execute-project-use-case.ts b/apps/sim/lib/mothership/application/execute-project-use-case.ts
new file mode 100644
index 00000000000..bb49d399f43
--- /dev/null
+++ b/apps/sim/lib/mothership/application/execute-project-use-case.ts
@@ -0,0 +1,15 @@
+import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter'
+import { projectOperations } from '@/lib/projects/application'
+import { PROJECT_DISCOVERY_DELEGATION_TTL_MS } from '@/lib/projects/application/operations'
+
+export const executeCopilotProjectDiscovery = createCopilotApplicationAdapter({
+  mode: 'resource',
+  domain: 'project discovery',
+  operations: { list: projectOperations.list },
+  resourceScope: { kind: 'project_discovery' },
+  delegation: {
+    audience: projectOperations.list.delegationAudience,
+    ttlMs: PROJECT_DISCOVERY_DELEGATION_TTL_MS,
+    createDelegationId: (context) => context.toolCallId,
+  },
+})
diff --git a/apps/sim/lib/mothership/application/file-owner-context.ts b/apps/sim/lib/mothership/application/file-owner-context.ts
new file mode 100644
index 00000000000..67bf5104c22
--- /dev/null
+++ b/apps/sim/lib/mothership/application/file-owner-context.ts
@@ -0,0 +1,61 @@
+import { generateId } from '@sim/utils/id'
+import { omit } from '@sim/utils/object'
+import { asOrchestrationError } from '@/lib/core/orchestration/types'
+import { executeCopilotProjectDiscovery } from '@/lib/mothership/application/execute-project-use-case'
+import {
+  type CopilotExecutionContext,
+  hasCopilotResourceAdmission,
+} from '@/lib/mothership/auth/application-delegation'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
+import type { FileOwnerContext } from '@/lib/mothership/generated/file-owner'
+import { supportsFileOwnerProtocol } from '@/lib/mothership/request/lifecycle/file-owner-protocol'
+import { getCurrentWorkspaceProject } from '@/lib/projects/application'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
+
+/** Adds current owner hints to admitted authoring turns using the worker's generated contract. */
+export async function withFileOwnerContext(
+  payload: Record<string, unknown>,
+  context: CopilotExecutionContext,
+  baseURL: string,
+  route: string
+): Promise<Record<string, unknown>> {
+  const clean = omit(payload, ['project', 'fileOwnerCapabilities', 'fileOwnerProtocolVersion'])
+  if (
+    !['/api/copilot', '/api/mothership'].includes(route) ||
+    context.requestMode === 'assistant' ||
+    !(await isProjectFileApiEnabled()) ||
+    !hasCopilotResourceAdmission(context) ||
+    !(await supportsFileOwnerProtocol(baseURL))
+  )
+    return clean
+
+  const hints: FileOwnerContext = {
+    fileOwnerProtocolVersion: 1,
+    project: null,
+    fileOwnerCapabilities: [],
+  }
+  if (context.workspaceId) {
+    const discoveryContext = { ...context, toolCallId: `file-context:${generateId()}` }
+    try {
+      const result = await executeCopilotProjectDiscovery(
+        discoveryContext,
+        getCurrentWorkspaceProject,
+        {}
+      )
+      const project = result.project
+      if (project) {
+        const owner = { entityType: 'project' as const, entityId: project.id }
+        const capability = await getCopilotFileOwnerAdapter(owner).capabilities?.(
+          discoveryContext,
+          owner
+        )
+        hints.project = { id: project.id, name: project.name }
+        hints.fileOwnerCapabilities = capability ? [capability] : []
+      }
+    } catch (error) {
+      const code = asOrchestrationError(error)?.code
+      if (code !== 'forbidden' && code !== 'not_found') throw error
+    }
+  }
+  return { ...clean, ...hints }
+}
diff --git a/apps/sim/lib/mothership/application/resource-adapter.test.ts b/apps/sim/lib/mothership/application/resource-adapter.test.ts
new file mode 100644
index 00000000000..e57a1b0eb65
--- /dev/null
+++ b/apps/sim/lib/mothership/application/resource-adapter.test.ts
@@ -0,0 +1,245 @@
+import type { Principal } from '@sim/auth/principal'
+import { describe, expect, it } from 'vitest'
+import { requireResourceDelegation } from '@/lib/core/application/resource-delegation'
+import { createCopilotApplicationAdapter } from '@/lib/mothership/application/application-adapter'
+import {
+  type CopilotExecutionContext,
+  createCopilotResourceAdmission,
+  hasCopilotResourceAdmission,
+} from '@/lib/mothership/auth/application-delegation'
+
+const operation = Object.freeze({
+  id: 'projects.list',
+  capability: 'none',
+  principalKinds: Object.freeze(['resource_delegated']),
+  delegatedServices: Object.freeze(['copilot']),
+  delegationAudience: 'sim:projects:discovery',
+} as const)
+const delegation = {
+  audience: operation.delegationAudience,
+  ttlMs: 60_000,
+  createDelegationId: (context: { toolCallId: string }) => context.toolCallId,
+}
+const useCase = {
+  operation,
+  async execute({ principal }: { principal: Principal; input: unknown }) {
+    return principal
+  },
+}
+const adapter = () =>
+  createCopilotApplicationAdapter({
+    mode: 'resource',
+    domain: 'projects',
+    delegation,
+    operations: { list: operation },
+    resourceScope: { kind: 'project_discovery' },
+  })
+
+function admittedContext(): CopilotExecutionContext {
+  return {
+    userId: 'real-user',
+    chatId: 'real-chat',
+    toolCallId: 'real-tool-call',
+    copilotToolExecution: true,
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId: 'real-user',
+      invocation: { kind: 'chat', chatId: 'real-chat' },
+    }),
+  }
+}
+
+describe('Copilot resource authoring admission', () => {
+  it('recognizes turn admission before a tool call exists without accepting copied recovery evidence', () => {
+    const context = { ...admittedContext(), toolCallId: undefined }
+    expect(hasCopilotResourceAdmission(context)).toBe(true)
+    for (const changed of [
+      { ...context, userId: 'other' },
+      { ...context, chatId: 'other' },
+      { ...context, mcpBlockId: 'block' },
+      { ...context, executorDelegationOrigin: {} },
+      { ...context, copilotResourceAdmission: { ...context.copilotResourceAdmission } },
+    ]) {
+      expect(hasCopilotResourceAdmission(changed as never)).toBe(false)
+    }
+  })
+
+  it('binds the actual user and invocation without a selected workspace', async () => {
+    const result = await adapter()(admittedContext(), useCase, {
+      userId: 'forged-user',
+      chatId: 'forged-chat',
+      scope: { kind: 'entity', entityType: 'organization', entityId: 'other' },
+    })
+    expect(result).toMatchObject({
+      kind: 'resource_delegated',
+      subjectUserId: 'real-user',
+      serviceId: 'copilot',
+      delegationId: 'real-tool-call',
+      invocation: { kind: 'chat', chatId: 'real-chat' },
+      scope: { kind: 'project_discovery' },
+    })
+  })
+
+  it('retains editor workflow and Copilot run identity without treating them as workflow authority', async () => {
+    const result = await adapter()(
+      { ...admittedContext(), workflowId: 'edited-workflow', executionId: 'copilot-run' },
+      useCase,
+      {}
+    )
+    expect(result.kind).toBe('resource_delegated')
+  })
+
+  it('accepts an explicitly admitted workspace authoring run without a chat', async () => {
+    const result = await adapter()(
+      {
+        userId: 'real-user',
+        workspaceId: 'workspace',
+        toolCallId: 'tool',
+        copilotToolExecution: true,
+        copilotInteractionMode: 'headless',
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: 'real-user',
+          invocation: { kind: 'workspace', workspaceId: 'workspace' },
+        }),
+      },
+      useCase,
+      {}
+    )
+    expect(result).toMatchObject({ invocation: { kind: 'workspace', workspaceId: 'workspace' } })
+  })
+
+  it.each([
+    ['another subject', { userId: 'other' }],
+    ['another chat', { chatId: 'other' }],
+    ['missing tool identity', { toolCallId: undefined }],
+    ['missing admission', { copilotResourceAdmission: undefined }],
+    ['executor origin', { executorDelegationOrigin: { workflowId: 'workflow' } }],
+    ['Mothership block', { mcpBlockId: 'block' }],
+    ['workflow execution', { boundWorkflowExecutionId: 'workflow-execution' }],
+  ])('rejects %s even when old origin flags say interactive', (_name, changes) => {
+    const context = { ...admittedContext(), copilotInteractionMode: 'interactive', ...changes }
+    expect(() => adapter()(context as never, useCase, {})).toThrow()
+  })
+
+  it('does not accept serialized or copied admission objects', () => {
+    const context = admittedContext()
+    for (const admission of [
+      { userId: 'real-user', invocation: { kind: 'chat', chatId: 'real-chat' } },
+      { ...context.copilotResourceAdmission },
+    ]) {
+      expect(() =>
+        adapter()({ ...context, copilotResourceAdmission: admission } as never, useCase, {})
+      ).toThrow('authoring admission')
+    }
+  })
+
+  it('refuses same-ID operation substitution', () => {
+    expect(() =>
+      adapter()(admittedContext(), { ...useCase, operation: { ...operation } }, {})
+    ).toThrow('Unregistered Copilot projects operation')
+  })
+
+  it('refuses a registered operation that does not admit Copilot resource delegation', () => {
+    const refusedOperation = Object.freeze({
+      ...operation,
+      delegatedServices: Object.freeze(['realtime']),
+    } as const)
+    const execute = createCopilotApplicationAdapter({
+      mode: 'resource',
+      domain: 'projects',
+      delegation,
+      operations: { list: refusedOperation },
+      resourceScope: { kind: 'project_discovery' },
+    })
+    expect(() =>
+      execute(admittedContext(), { ...useCase, operation: refusedOperation }, {})
+    ).toThrow('does not admit Copilot resource delegation')
+  })
+
+  it('refuses the wrong domain audience even with a registered operation', () => {
+    const execute = createCopilotApplicationAdapter({
+      mode: 'resource',
+      domain: 'projects',
+      delegation: { ...delegation, audience: 'sim:files' },
+      operations: { list: operation },
+      resourceScope: { kind: 'project_discovery' },
+    })
+    expect(() => execute(admittedContext(), useCase, {})).toThrow('delegation audience')
+  })
+
+  it('projects a requested file bound only from the adapter scope argument', async () => {
+    const execute = createCopilotApplicationAdapter<typeof operation, { fileId: string }>({
+      mode: 'resource',
+      domain: 'projects',
+      delegation,
+      operations: { list: operation },
+      projectResourceScope: ({ fileId }) => ({
+        kind: 'entity',
+        entityType: 'project',
+        entityId: 'project',
+        fileId,
+      }),
+    })
+    const result = await execute(
+      admittedContext(),
+      useCase,
+      { fileId: 'forged' },
+      { fileId: 'file' }
+    )
+    expect(result).toMatchObject({
+      scope: { kind: 'entity', entityType: 'project', entityId: 'project', fileId: 'file' },
+    })
+  })
+
+  it('copy delegation cannot be widened by mutating nested requested targets after admission', async () => {
+    const copyOperation = Object.freeze({
+      ...operation,
+      id: 'files.copy',
+      delegationAudience: 'sim:files:copy',
+    })
+    const scope = {
+      kind: 'file_copy' as const,
+      source: {
+        owner: { entityType: 'workspace' as const, entityId: 'source' },
+        fileIds: ['one'],
+        folderIds: [] as string[],
+      },
+      destination: {
+        owner: { entityType: 'project' as const, entityId: 'destination' },
+        folderId: null as string | null,
+      },
+    }
+    const required = structuredClone(scope)
+    const execute = createCopilotApplicationAdapter({
+      mode: 'resource',
+      domain: 'file-copy',
+      delegation: { ...delegation, audience: copyOperation.delegationAudience },
+      operations: { copy: copyOperation },
+      resourceScope: scope,
+    })
+    const result = await execute(admittedContext(), { ...useCase, operation: copyOperation }, {})
+    scope.source.owner.entityId = 'another-owner'
+    scope.source.fileIds.push('extra-file')
+    scope.destination.folderId = 'another-folder'
+    expect(
+      requireResourceDelegation(result, {
+        audience: copyOperation.delegationAudience,
+        services: ['copilot'],
+        maxTtlMs: 60_000,
+        scope: required,
+      })
+    ).toBe('real-user')
+    expect(() =>
+      requireResourceDelegation(result, {
+        audience: copyOperation.delegationAudience,
+        services: ['copilot'],
+        maxTtlMs: 60_000,
+        scope,
+      })
+    ).toThrow('Resource delegation is no longer valid')
+    if (result.kind !== 'resource_delegated' || result.scope.kind !== 'file_copy')
+      throw new Error('Missing copy grant')
+    expect(Reflect.set(result.scope.source.owner, 'entityId', 'forged')).toBe(false)
+    expect(Reflect.set(result.scope.source.fileIds, '1', 'injected')).toBe(false)
+    expect(Reflect.set(result.scope.destination, 'folderId', 'forged')).toBe(false)
+  })
+})
diff --git a/apps/sim/lib/mothership/auth/application-delegation.ts b/apps/sim/lib/mothership/auth/application-delegation.ts
index 62993efc220..f375c5b669c 100644
--- a/apps/sim/lib/mothership/auth/application-delegation.ts
+++ b/apps/sim/lib/mothership/auth/application-delegation.ts
@@ -1,4 +1,10 @@
-import type { DelegatedPrincipal, OrganizationDelegatedPrincipal } from '@sim/auth/principal'
+import type {
+  DelegatedPrincipal,
+  OrganizationDelegatedPrincipal,
+  ResourceDelegatedPrincipal,
+  ResourceDelegationScope,
+} from '@sim/auth/principal'
+import { requireResourceDelegation } from '@/lib/core/application/resource-delegation'
 import { TOOL_WATCHDOG_LONG_RUNNING_MS } from '@/lib/mothership/constants'
 
 /**
@@ -17,8 +23,149 @@ export interface CopilotExecutionContext {
   chatId?: string
   executionId?: string
   toolCallId?: string
+  mcpBlockId?: string
+  executorDelegationOrigin?: unknown
+  boundWorkflowExecutionId?: string
   copilotToolExecution?: boolean
   copilotInteractionMode?: 'interactive' | 'headless'
+  copilotResourceAdmission?: CopilotResourceAdmission
+}
+
+type CopilotResourcePrincipal = Extract<ResourceDelegatedPrincipal, { serviceId: 'copilot' }>
+
+const RESOURCE_ADMISSION = Symbol('copilot-resource-admission')
+
+/** Opaque admission evidence carried only inside Sim; serialized copies grant no authority. */
+export interface CopilotResourceAdmission {
+  readonly [RESOURCE_ADMISSION]: true
+}
+
+const RESOURCE_ADMISSIONS = new WeakMap<
+  CopilotResourceAdmission,
+  Readonly<{ userId: string; invocation: CopilotResourcePrincipal['invocation'] }>
+>()
+
+export interface TrustedCopilotResourceExecutionContext extends CopilotExecutionContext {
+  userId: string
+  toolCallId: string
+  copilotToolExecution: true
+  copilotResourceAdmission: CopilotResourceAdmission
+  invocation: CopilotResourcePrincipal['invocation']
+}
+
+export interface CopilotResourceDelegationConfiguration {
+  audience: string
+  ttlMs: number
+  createDelegationId(context: TrustedCopilotResourceExecutionContext): string
+}
+
+/** Called only after authoring ingress authenticates its user and invocation, including resumed runs. */
+export function createCopilotResourceAdmission(input: {
+  userId: string
+  invocation: CopilotResourcePrincipal['invocation']
+}): CopilotResourceAdmission {
+  requireNonEmpty(input.userId, 'an authenticated authoring user ID')
+  if (input.invocation.kind === 'chat') {
+    requireNonEmpty(input.invocation.chatId, 'an authoring chat ID')
+  } else if (input.invocation.kind === 'workspace') {
+    requireNonEmpty(input.invocation.workspaceId, 'an authoring workspace ID')
+  } else {
+    throw new Error('Copilot resource admission requires an authoring invocation')
+  }
+  const admission = Object.freeze({ [RESOURCE_ADMISSION]: true as const })
+  RESOURCE_ADMISSIONS.set(
+    admission,
+    Object.freeze({ userId: input.userId, invocation: Object.freeze({ ...input.invocation }) })
+  )
+  return admission
+}
+
+function resourceAdmissionForContext(context: CopilotExecutionContext | undefined) {
+  const admission = context?.copilotResourceAdmission
+    ? RESOURCE_ADMISSIONS.get(context.copilotResourceAdmission)
+    : undefined
+  if (!context || !admission) return undefined
+  if (
+    context.copilotToolExecution !== true ||
+    context.userId !== admission.userId ||
+    context.executorDelegationOrigin !== undefined ||
+    context.mcpBlockId !== undefined ||
+    context.boundWorkflowExecutionId !== undefined ||
+    (admission.invocation.kind === 'chat'
+      ? context.chatId !== admission.invocation.chatId
+      : context.workspaceId !== admission.invocation.workspaceId || context.chatId !== undefined)
+  ) {
+    return undefined
+  }
+  return admission
+}
+
+/** Recognizes admitted authoring turns before a tool call exists, without serializing their evidence. */
+export function hasCopilotResourceAdmission(context: CopilotExecutionContext | undefined): boolean {
+  return resourceAdmissionForContext(context) !== undefined
+}
+
+/** Narrows positive server admission; old tool flags and model parameters cannot establish it. */
+export function requireTrustedCopilotResourceExecutionContext(
+  context: CopilotExecutionContext | undefined
+): TrustedCopilotResourceExecutionContext {
+  const admission = resourceAdmissionForContext(context)
+  if (!context || !admission || !context.copilotResourceAdmission) {
+    throw new Error('Copilot resource operations require current authoring admission')
+  }
+  requireNonEmpty(context.toolCallId, 'a tool call ID')
+  return Object.freeze({
+    userId: admission.userId,
+    toolCallId: context.toolCallId,
+    copilotToolExecution: true,
+    copilotResourceAdmission: context.copilotResourceAdmission,
+    invocation: admission.invocation,
+    ...(context.chatId ? { chatId: context.chatId } : {}),
+    ...(context.workspaceId ? { workspaceId: context.workspaceId } : {}),
+    ...(context.organizationId ? { organizationId: context.organizationId } : {}),
+    ...(context.workflowId ? { workflowId: context.workflowId } : {}),
+    ...(context.executionId ? { executionId: context.executionId } : {}),
+    ...(context.requestMode ? { requestMode: context.requestMode } : {}),
+    ...(context.copilotInteractionMode
+      ? { copilotInteractionMode: context.copilotInteractionMode }
+      : {}),
+  })
+}
+
+/** Creates per-operation resource authority while preserving the admitted human and invocation. */
+export function createCopilotResourceApplicationPrincipal(
+  context: TrustedCopilotResourceExecutionContext,
+  options: CopilotResourceDelegationConfiguration & { scope: ResourceDelegationScope }
+): CopilotResourcePrincipal {
+  const trustedContext = requireTrustedCopilotResourceExecutionContext(context)
+  const issuedAt = new Date()
+  const scope = structuredClone(options.scope)
+  if (scope.kind === 'file_copy') {
+    Object.freeze(scope.source.owner)
+    Object.freeze(scope.source.fileIds)
+    Object.freeze(scope.source.folderIds)
+    Object.freeze(scope.source)
+    Object.freeze(scope.destination.owner)
+    Object.freeze(scope.destination)
+  }
+  const principal: CopilotResourcePrincipal = Object.freeze({
+    kind: 'resource_delegated',
+    serviceId: 'copilot',
+    subjectUserId: trustedContext.userId,
+    delegationId: options.createDelegationId(trustedContext),
+    audience: options.audience,
+    issuedAt,
+    expiresAt: new Date(issuedAt.getTime() + options.ttlMs),
+    invocation: Object.freeze({ ...trustedContext.invocation }),
+    scope: Object.freeze(scope),
+  })
+  requireResourceDelegation(principal, {
+    audience: options.audience,
+    services: ['copilot'],
+    scope: options.scope,
+    maxTtlMs: options.ttlMs,
+  })
+  return principal
 }
 
 export interface TrustedCopilotExecutionContext extends CopilotExecutionContext {
diff --git a/apps/sim/lib/mothership/chat/persisted-message.ts b/apps/sim/lib/mothership/chat/persisted-message.ts
index 9771edb2973..adce6c415db 100644
--- a/apps/sim/lib/mothership/chat/persisted-message.ts
+++ b/apps/sim/lib/mothership/chat/persisted-message.ts
@@ -12,6 +12,7 @@ import {
   redactSensitiveContent,
   redactToolCallResult,
 } from '@/lib/mothership/chat/sim-key-redaction'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import {
   MothershipStreamV1CompletionStatus,
   MothershipStreamV1EventType,
@@ -39,6 +40,7 @@ export interface PersistedFileAttachment {
 }
 
 export interface PersistedMessageContext {
+  owner?: FileOperationOwner
   kind: string
   label: string
   workflowId?: string
@@ -92,6 +94,7 @@ export function copyPersistedMessageContext(c: PersistedMessageContext): Persist
   return {
     kind: c.kind,
     label: c.label,
+    ...(c.owner ? { owner: { ...c.owner } } : {}),
     ...(c.workflowId ? { workflowId: c.workflowId } : {}),
     ...(c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
     ...(c.tableId ? { tableId: c.tableId } : {}),
diff --git a/apps/sim/lib/mothership/chat/post.test.ts b/apps/sim/lib/mothership/chat/post.test.ts
index f3a20229b71..9e275a22693 100644
--- a/apps/sim/lib/mothership/chat/post.test.ts
+++ b/apps/sim/lib/mothership/chat/post.test.ts
@@ -43,6 +43,7 @@ import { createMockRequest } from '@sim/testing/mocks/request.mock'
 import { NextRequest } from 'next/server'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { getChatResourceKey, type MothershipResource } from '@/lib/mothership/resources/types'
 import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 
 const flags = vi.hoisted(() => ({ plan: vi.fn(), models: vi.fn() }))
@@ -66,6 +67,7 @@ const {
   generateWorkspaceSnapshot,
   processContextsServer,
   resolveActiveResourceContext,
+  resolveOwnedFileContext,
   createSSEStream,
   acquirePendingChatStream,
   getPendingChatStreamId,
@@ -82,6 +84,7 @@ const {
   generateWorkspaceSnapshot: vi.fn(),
   processContextsServer: vi.fn(),
   resolveActiveResourceContext: vi.fn(),
+  resolveOwnedFileContext: vi.fn(),
   createSSEStream: vi.fn(),
   acquirePendingChatStream: vi.fn(),
   getPendingChatStreamId: vi.fn(),
@@ -167,6 +170,7 @@ vi.mock('@/lib/mothership/chat/workspace-context', () => ({
 vi.mock('@/lib/mothership/chat/process-contents', () => ({
   processContextsServer,
   resolveActiveResourceContext,
+  resolveOwnedFileContext,
 }))
 
 vi.mock('@/lib/mothership/chat/application/admit-turn', () => ({
@@ -995,6 +999,33 @@ describe('handleUnifiedChatPost', () => {
     )
   })
 
+  it('keeps a workspace file panel identity when the first message creates a chat', async () => {
+    const panel: MothershipResource = { type: 'file', id: 'file-1', title: 'Draft' }
+    resolveOwnedFileContext.mockResolvedValue({
+      type: 'active_resource',
+      content: '',
+      resource: {
+        ...panel,
+        title: 'Canonical file',
+        owner: { entityType: 'workspace', entityId: 'ws-1' },
+      },
+    })
+    const response = await handleUnifiedChatPost(
+      new NextRequest('http://localhost/api/copilot/chat', {
+        method: 'POST',
+        body: JSON.stringify({
+          message: 'Read this file',
+          workspaceId: 'ws-1',
+          createNewChat: true,
+          resourceAttachments: [panel],
+        }),
+      })
+    )
+    expect(response.status).toBe(200)
+    const persisted: MothershipResource[] = persistChatResources.mock.calls[0][1]
+    expect(persisted.map(getChatResourceKey)).toEqual([getChatResourceKey(panel)])
+  })
+
   it('never persists browser tab attachments, which the desktop app restores itself', async () => {
     const response = await handleUnifiedChatPost(
       new NextRequest('http://localhost/api/copilot/chat', {
@@ -1088,7 +1119,8 @@ describe('handleUnifiedChatPost', () => {
       'ws-1',
       'chat-1',
       expect.any(ResolvedSecretTraceRegistry),
-      undefined
+      undefined,
+      'agent'
     )
     expect(resolveActiveResourceContext).toHaveBeenCalledWith(
       'table',
@@ -1204,7 +1236,8 @@ describe('handleUnifiedChatPost', () => {
       'ws-1',
       'chat-1',
       expect.any(ResolvedSecretTraceRegistry),
-      undefined
+      undefined,
+      'agent'
     )
   })
 
diff --git a/apps/sim/lib/mothership/chat/post.ts b/apps/sim/lib/mothership/chat/post.ts
index ce17deca925..9ede2a77abe 100644
--- a/apps/sim/lib/mothership/chat/post.ts
+++ b/apps/sim/lib/mothership/chat/post.ts
@@ -31,6 +31,7 @@ import {
 import { loadCopilotSearchIntegrations } from '@/lib/mothership/application/load-search-integrations'
 import { chatOperations } from '@/lib/mothership/application/operations'
 import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
 import { admitChatTurn } from '@/lib/mothership/chat/application/admit-turn'
 import { ChatSendSupersededError } from '@/lib/mothership/chat/application/send-superseded'
 import {
@@ -57,6 +58,7 @@ import { buildCopilotRequestPayload } from '@/lib/mothership/chat/payload'
 import {
   processContextsServer,
   resolveActiveResourceContext,
+  resolveOwnedFileContext,
 } from '@/lib/mothership/chat/process-contents'
 import {
   MAX_FILE_SELECTION_TEXT_LENGTH,
@@ -71,8 +73,11 @@ import {
 } from '@/lib/mothership/constants'
 import { prepareCopilotEnvironmentContext } from '@/lib/mothership/environment-context'
 import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
 import { AssistantSearchLevel } from '@/lib/mothership/generated/assistant'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import {
+  type ChatContextItem,
   type ChatRequest,
   type ModelSelection,
   ModelSelectionSchema,
@@ -229,6 +234,7 @@ const ChatContextSchema = z
       'browser_tab',
       'terminal_tab',
       'workspace',
+      'project',
     ]),
     label: z.string().max(MAX_CHAT_CONTEXT_LABEL_LENGTH),
     chatId: z.string().optional(),
@@ -242,11 +248,13 @@ const ChatContextSchema = z
     viewId: mothershipResourceSchema.shape.viewId,
     currentView: mothershipTableViewContextSchema.optional(),
     fileId: z.string().optional(),
+    owner: FileOperationOwner.optional(),
     dashboardId: z.string().optional(),
     folderId: z.string().optional(),
     fileFolderId: z.string().optional(),
     skillId: z.string().optional(),
     workspaceId: z.string().min(1).max(200).optional(),
+    projectId: z.string().min(1).max(200).optional(),
     serverId: z.string().optional(),
     scheduleId: z.string().optional(),
     tabId: z.string().optional(),
@@ -260,7 +268,28 @@ const ChatContextSchema = z
     columnIds: z.array(z.string()).max(MAX_TABLE_SELECTION_COLUMNS).optional(),
     selection: z.union([BrowserTextSelectionSchema, TerminalTextSelectionSchema]).optional(),
   })
-  .superRefine(({ kind, selection, workspaceId }, refinementContext) => {
+  .superRefine(({ kind, selection, workspaceId, projectId, owner }, refinementContext) => {
+    if (
+      (kind === 'project' && (!projectId || workspaceId !== undefined)) ||
+      (kind !== 'project' && projectId !== undefined)
+    ) {
+      refinementContext.addIssue({
+        code: 'custom',
+        path: ['projectId'],
+        message: 'A Project context requires only a Project target',
+      })
+    }
+    if (
+      owner &&
+      ((kind !== 'file' && kind !== 'file_selection') ||
+        (owner.entityType !== 'workspace' && workspaceId) ||
+        (owner.entityType === 'workspace' && workspaceId && owner.entityId !== workspaceId))
+    )
+      refinementContext.addIssue({
+        code: 'custom',
+        path: ['owner'],
+        message: 'File owner conflicts with the context target',
+      })
     if (kind === 'workspace' && !workspaceId) {
       refinementContext.addIssue({
         code: 'custom',
@@ -535,6 +564,7 @@ function collectChatMcpServerIds(
 }
 
 async function resolveAgentContexts(params: {
+  requestMode: UnifiedChatRequest['mode']
   contexts?: UnifiedChatRequest['contexts']
   resourceAttachments?: UnifiedChatRequest['resourceAttachments']
   organizationId?: string
@@ -546,8 +576,9 @@ async function resolveAgentContexts(params: {
   chatId?: string
   resolvedSecretTraceRegistry?: ExecutionContext['resolvedSecretTraceRegistry']
   requestId: string
-}): Promise<Array<{ type: string; content: string; tag?: string; path?: string }>> {
+}): Promise<ChatContextItem[]> {
   const {
+    requestMode,
     contexts,
     resourceAttachments,
     organizationId,
@@ -561,7 +592,7 @@ async function resolveAgentContexts(params: {
     requestId,
   } = params
 
-  let agentContexts: Array<{ type: string; content: string; tag?: string; path?: string }> = []
+  let agentContexts: ChatContextItem[] = []
 
   if (Array.isArray(contexts) && contexts.length > 0) {
     try {
@@ -572,7 +603,8 @@ async function resolveAgentContexts(params: {
         workspaceId,
         chatId,
         resolvedSecretTraceRegistry,
-        organizationId
+        organizationId,
+        requestMode
       )
     } catch (error) {
       logger.error(`[${requestId}] Failed to process contexts`, error)
@@ -620,6 +652,65 @@ async function resolveAgentContexts(params: {
             content: `The user's Search results tab has this retrieval address: ${JSON.stringify(resource.search)}. This is query context, not retrieved evidence; use the search tools for current authorized results.`,
           }
         }
+        if (resource.type === 'file') {
+          if (resource.viewId || resource.currentView)
+            throw new Error('Invalid file resource target')
+          const usesWorkspace =
+            !resource.owner ||
+            getCopilotFileOwnerAdapter(resource.owner).resourceScope === 'workspace'
+          const assertedWorkspaceId = usesWorkspace
+            ? (resource.owner?.entityId ?? resource.workspaceId)
+            : undefined
+          if (
+            resource.workspaceId &&
+            (!usesWorkspace || resource.workspaceId !== assertedWorkspaceId)
+          )
+            throw new Error('File owner conflicts with the selected workspace')
+          const target = usesWorkspace
+            ? organizationId || assertedWorkspaceId
+              ? await resolveInvocationWorkspace(
+                  { userId, workspaceId, organizationId, chatId },
+                  assertedWorkspaceId
+                )
+              : workspaceId
+                ? { workspaceId }
+                : null
+            : null
+          const owner =
+            resource.owner ??
+            (target ? { entityType: 'workspace' as const, entityId: target.workspaceId } : null)
+          if (!owner || (usesWorkspace && !target))
+            throw new Error('File resource requires an owner')
+          const readContext = () =>
+            resolveOwnedFileContext(
+              { owner, fileId: resource.id },
+              { userId, workspaceId: target?.workspaceId ?? workspaceId, chatId, requestMode }
+            )
+          const ctx = target
+            ? await withWorkspaceInvocationScope(
+                { workspaceId: target.workspaceId, organizationId },
+                readContext
+              )
+            : await readContext()
+          if (persistResources && ctx.resource)
+            authorizedResources.push(
+              mothershipResourceSchema.parse({
+                ...resource,
+                ...ctx.resource,
+                ...(usesWorkspace ? { owner: resource.owner } : {}),
+                ...(organizationId && target
+                  ? { workspaceId: target.workspaceId }
+                  : { workspaceId: undefined, workspaceName: undefined }),
+              })
+            )
+          return {
+            ...ctx,
+            ...(organizationId && target
+              ? { content: `Workspace ${target.workspaceId}:\n${ctx.content}` }
+              : {}),
+            tag: resource.active ? '@active_tab' : '@open_tab',
+          }
+        }
         const target =
           organizationId || resource.workspaceId
             ? await resolveInvocationWorkspace(
@@ -629,7 +720,13 @@ async function resolveAgentContexts(params: {
             : workspaceId
               ? { workspaceId }
               : null
-        if (!target) return null
+        if (!target) throw new Error('Resource target requires a workspace')
+        if (
+          resource.owner &&
+          (resource.owner.entityType !== 'workspace' ||
+            resource.owner.entityId !== target.workspaceId)
+        )
+          throw new Error('File owner does not match the selected workspace')
         const ctx = await withWorkspaceInvocationScope(
           { workspaceId: target.workspaceId, organizationId },
           () =>
@@ -1320,6 +1417,7 @@ export async function handleUnifiedChatPost(req: NextRequest) {
           },
           () =>
             resolveAgentContexts({
+              requestMode: body.mode,
               contexts: normalizedContexts,
               resourceAttachments: body.resourceAttachments,
               organizationId: branch.kind === 'organization' ? branch.organizationId : undefined,
@@ -1383,6 +1481,18 @@ export async function handleUnifiedChatPost(req: NextRequest) {
         executionContext.assistantSearch = body.assistantSearch
 
       executionContext.userPermission = userPermission ?? undefined
+      if (actualChatId || workspaceId) {
+        const invocation = actualChatId
+          ? { kind: 'chat' as const, chatId: actualChatId }
+          : workspaceId
+            ? { kind: 'workspace' as const, workspaceId }
+            : undefined
+        if (invocation)
+          executionContext.copilotResourceAdmission = createCopilotResourceAdmission({
+            userId: authenticatedUserId,
+            invocation,
+          })
+      }
 
       /** Trace catalog preparation and attachment tracking before durable admission. */
       const preparedPayload = await withCopilotSpan(
@@ -1500,6 +1610,7 @@ export async function handleUnifiedChatPost(req: NextRequest) {
             },
             recovery: {
               kind: 'interactive_stream',
+              resourceAuthoringVersion: 1,
               request: { ...requestPayload, messageId: userMessageId, chatId: actualChatId },
               goRoute: branch.goRoute,
               clientToolPickupExpected,
diff --git a/apps/sim/lib/mothership/chat/process-contents.ts b/apps/sim/lib/mothership/chat/process-contents.ts
index f9ca6810707..d2b04b59e41 100644
--- a/apps/sim/lib/mothership/chat/process-contents.ts
+++ b/apps/sim/lib/mothership/chat/process-contents.ts
@@ -22,13 +22,14 @@ import {
 import { toOverview } from '@/lib/logs/log-views'
 import type { TraceSpan } from '@/lib/logs/types'
 import { createCopilotChatKnowledgePrincipal } from '@/lib/mothership/application/execute-knowledge-use-case'
+import { executeCopilotProjectDiscovery } from '@/lib/mothership/application/execute-project-use-case'
 import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
 import {
   COPILOT_APPLICATION_DELEGATION_TTL_MS,
   createCopilotChatPrincipal,
+  createCopilotResourceAdmission,
   createTrustedOrganizationCopilotPrincipal,
 } from '@/lib/mothership/auth/application-delegation'
-import { createCopilotChatFilePrincipal } from '@/lib/mothership/auth/file-delegation'
 import { createCopilotChatTablePrincipal } from '@/lib/mothership/auth/table-delegation'
 import { getBlockVisibilityForCopilot } from '@/lib/mothership/block-visibility'
 import { readWorkspaceContext } from '@/lib/mothership/chat/application/workspace-context'
@@ -50,14 +51,18 @@ import {
   safeBrowserSelectionUrl,
   truncateSelectionText,
 } from '@/lib/mothership/chat/selection-context'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
+import type { ChatFileIngress } from '@/lib/mothership/file-owners/types'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
+import type { ResourceAddress } from '@/lib/mothership/generated/resources'
 import { QueryLogs } from '@/lib/mothership/generated/tool-catalog-v1'
-import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils'
 import { isBlockTypeAccessControlExempt } from '@/lib/permission-groups/block-access'
 import { resolvePermissionGroupConfig } from '@/lib/permission-groups/config-scope.server'
 import {
   intersectIntegrationAllowlists,
   resolveAccessControlBlockType,
 } from '@/lib/permission-groups/integration-allowlist'
+import { listProjects } from '@/lib/projects/application'
 import { skillDelegationPolicy } from '@/lib/skills/application/authorization'
 import { getSkillUseCase } from '@/lib/skills/application/use-cases'
 import { queryTableRows } from '@/lib/table/application/rows'
@@ -68,7 +73,7 @@ import type { ColumnDefinition } from '@/lib/table/types'
 import { workflowDelegationPolicy } from '@/lib/workflows/application/authorization'
 import { readWorkflowMetadata } from '@/lib/workflows/application/read-workflow'
 import { getBuiltinSkillById } from '@/lib/workflows/skills/builtin-skills'
-import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata'
+import type { OwnedFileTarget } from '@/lib/workspace-files/ownership'
 import { getBlockRegistry } from '@/blocks/registry'
 import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 import type { BrowserTextSelection, ChatContext, TerminalTextSelection } from '@/stores/panel'
@@ -95,6 +100,7 @@ type AgentContextType =
   | 'browser_tab'
   | 'terminal_tab'
   | 'workspace'
+  | 'project'
 
 interface AgentContext {
   type: AgentContextType
@@ -102,6 +108,7 @@ interface AgentContext {
   content: string
   /** A CLI-readable file address; other resources carry canonical references in content. */
   path?: string
+  resource?: ResourceAddress
 }
 
 const logger = createLogger('ProcessContents')
@@ -145,7 +152,8 @@ export async function processContextsServer(
   currentWorkspaceId?: string,
   chatId?: string,
   resolvedSecretTraceRegistry?: ResolvedSecretTraceRegistry,
-  organizationId?: string
+  organizationId?: string,
+  requestMode?: string
 ): Promise<AgentContext[]> {
   if (!Array.isArray(contexts) || contexts.length === 0) return []
   if (contexts.length > MAX_CHAT_CONTEXTS) {
@@ -317,6 +325,7 @@ export async function processContextsServer(
         tag: ctx.label ? `@${ctx.label}` : '@',
         content: result.content,
         path: result.path,
+        resource: result.resource,
       }
     }
     if (ctx.kind === 'file_selection' && ctx.fileId && workspaceId) {
@@ -405,11 +414,57 @@ export async function processContextsServer(
 
   const resolveContext = async (ctx: ChatContext): Promise<AgentContext | null> => {
     try {
+      if ((ctx.kind === 'file' || ctx.kind === 'file_selection') && ctx.owner !== undefined) {
+        const parsed = FileOperationOwner.safeParse(ctx.owner)
+        if (!parsed.success) return null
+        if (getCopilotFileOwnerAdapter(parsed.data).resourceScope === 'owner') {
+          if (ctx.workspaceId) return null
+          return await resolveOwnedFileContext(
+            { owner: parsed.data, fileId: ctx.fileId },
+            { userId, workspaceId: currentWorkspaceId, chatId, requestMode },
+            ctx
+          )
+        }
+        if (
+          (ctx.workspaceId && ctx.workspaceId !== parsed.data.entityId) ||
+          (!organizationId && currentWorkspaceId !== parsed.data.entityId)
+        )
+          return null
+        ctx = { ...ctx, workspaceId: parsed.data.entityId }
+      }
       // Global code-owned templates do not require an arbitrary workspace.
       const builtin =
         ctx.kind === 'skill' && organizationId ? getBuiltinSkillById(ctx.skillId) : undefined
       if (builtin)
         return { type: 'skill', tag: ctx.label ? `@${ctx.label}` : '@', content: builtin.content }
+      if (ctx.kind === 'project') {
+        if (!organizationId || !chatId || (requestMode !== 'agent' && requestMode !== 'plan'))
+          return null
+        const { projects } = await executeCopilotProjectDiscovery(
+          {
+            userId,
+            chatId,
+            organizationId,
+            requestMode,
+            toolCallId: `context:project:${ctx.projectId}`,
+            copilotToolExecution: true,
+            copilotResourceAdmission: createCopilotResourceAdmission({
+              userId,
+              invocation: { kind: 'chat', chatId },
+            }),
+          },
+          listProjects,
+          { organizationId, projectId: ctx.projectId, limit: 1 }
+        )
+        const [project] = projects
+        return project
+          ? {
+              type: 'project',
+              tag: ctx.label ? `@${ctx.label}` : '@',
+              content: `The user tagged this Project. Shared documentation belongs to this Project. Its environments are workspaces; target the appropriate environment for workflows and execution files. A Project tag does not select an environment.\n${JSON.stringify(project)}`,
+            }
+          : null
+      }
       if (ctx.kind === 'workspace') {
         return organizationId && chatId
           ? await describeWorkspace(ctx.workspaceId, ctx.label, userId, organizationId, chatId)
@@ -1033,21 +1088,10 @@ async function resolveFileResource(
   userId: string,
   chatId?: string
 ): Promise<AgentContext | null> {
-  const principal = createCopilotChatFilePrincipal({
-    userId,
-    workspaceId,
-    chatId,
-  })
-  const { file: record } = await readWorkspaceFileMetadata.execute({
-    principal,
-    input: { fileId, assertedWorkspaceId: workspaceId },
-  })
-  return {
-    type: 'active_resource',
-    tag: '@active_resource',
-    content: '',
-    path: canonicalWorkspaceFilePath({ folderPath: record.folderPath, name: record.name }),
-  }
+  return resolveOwnedFileContext(
+    { owner: { entityType: 'workspace', entityId: workspaceId }, fileId },
+    { userId, workspaceId, chatId }
+  )
 }
 
 /**
@@ -1082,30 +1126,39 @@ async function resolveFileSelectionResource(
   chatId?: string
 ): Promise<AgentContext | null> {
   if (!userId) throw new Error('File selection context requires a user ID')
-  const principal = createCopilotChatFilePrincipal({
-    userId,
-    workspaceId,
-    chatId,
-  })
-  const { file: record } = await readWorkspaceFileMetadata.execute({
-    principal,
-    input: { fileId, assertedWorkspaceId: workspaceId },
-  })
-  const path = canonicalWorkspaceFilePath({ folderPath: record.folderPath, name: record.name })
-  const snippet = truncateSelectionText(text)
-  const lineRange =
-    startLine && endLine && endLine !== startLine
-      ? ` (lines ${startLine}-${endLine})`
-      : startLine
-        ? ` (line ${startLine})`
-        : ''
-  const fence = codeFenceFor(snippet)
-  const content = `Selected passage from ${record.name}${lineRange}:\n\n${fence}\n${snippet}\n${fence}`
+  return resolveOwnedFileContext(
+    { owner: { entityType: 'workspace', entityId: workspaceId }, fileId },
+    { userId, workspaceId, chatId },
+    { kind: 'file_selection', fileId, fileName: label, text, label, startLine, endLine }
+  )
+}
+
+/** Reads canonical owner metadata while selection text remains the user's quoted snapshot. */
+export async function resolveOwnedFileContext(
+  target: OwnedFileTarget,
+  ingress: ChatFileIngress,
+  selected?: Extract<ChatContext, { kind: 'file' | 'file_selection' }>
+): Promise<AgentContext> {
+  const file = await getCopilotFileOwnerAdapter(target.owner).readChatMetadata(ingress, target)
+  let content = ''
+  if (selected?.kind === 'file_selection') {
+    const snippet = truncateSelectionText(selected.text)
+    const { startLine, endLine } = selected
+    const range =
+      startLine && endLine && endLine !== startLine
+        ? ` (lines ${startLine}-${endLine})`
+        : startLine
+          ? ` (line ${startLine})`
+          : ''
+    const fence = codeFenceFor(snippet)
+    content = `Selected passage from ${file.name}${range}:\n\n${fence}\n${snippet}\n${fence}`
+  }
   return {
-    type: 'file_selection',
-    tag: label ? `@${label}` : '@',
+    type: selected?.kind ?? 'active_resource',
+    tag: selected?.label ? `@${selected.label}` : '@active_resource',
     content,
-    path,
+    path: file.path,
+    resource: { type: 'file', id: file.id, title: file.name, path: file.path, owner: file.owner },
   }
 }
 
diff --git a/apps/sim/lib/mothership/chat/project-file-context.integration.ts b/apps/sim/lib/mothership/chat/project-file-context.integration.ts
new file mode 100644
index 00000000000..0e9163485f4
--- /dev/null
+++ b/apps/sim/lib/mothership/chat/project-file-context.integration.ts
@@ -0,0 +1,710 @@
+import { mkdir, writeFile } from 'node:fs/promises'
+import { dirname } from 'node:path'
+import { db } from '@sim/db'
+import {
+  copilotChats,
+  permissions,
+  projectWorkspace,
+  user,
+  workspace,
+  workspaceFiles,
+} from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
+import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
+import { createRouteContext } from '@sim/testing/helpers/http'
+import { authMock, authMockFns } from '@sim/testing/mocks/auth.mock'
+import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
+import { createMockRequest } from '@sim/testing/mocks/request.mock'
+import { getErrorMessage } from '@sim/utils/errors'
+import { generateId } from '@sim/utils/id'
+import { toRecord } from '@sim/utils/object'
+import { and, eq } from 'drizzle-orm'
+import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import { changeChatResources } from '@/lib/mothership/chat/application/change-resources'
+import { copyPersistedMessageContext } from '@/lib/mothership/chat/persisted-message'
+import { processContextsServer } from '@/lib/mothership/chat/process-contents'
+import { createEvent } from '@/lib/mothership/request/session/event'
+import { encodeSSEEnvelope } from '@/lib/mothership/request/session/sse'
+import { persistResourceEffect } from '@/lib/mothership/resources/persist-effect'
+import type { MothershipResource } from '@/lib/mothership/resources/types'
+import { executeTool, registerHandler } from '@/lib/mothership/tool-executor/executor'
+import { createServerToolHandler } from '@/lib/mothership/tools/registry/server-tool-adapter'
+import {
+  POST as addCopilotResource,
+  DELETE as removeCopilotResource,
+} from '@/app/api/copilot/chat/resources/route'
+import { DELETE as removeMothershipResource } from '@/app/api/mothership/chat/resources/route'
+import { GET as readMothershipChat } from '@/app/api/mothership/chats/[chatId]/route'
+
+vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
+
+vi.mock('@/lib/auth', () => authMock)
+
+const identityChecks: {
+  name: string
+  status: 'passed' | 'failed'
+  durationMs: number
+  error?: string
+}[] = []
+
+function identityCheck(name: string, run: () => Promise<void>) {
+  it(name, async () => {
+    const started = performance.now()
+    try {
+      await run()
+      identityChecks.push({ name, status: 'passed', durationMs: performance.now() - started })
+    } catch (error) {
+      identityChecks.push({
+        name,
+        status: 'failed',
+        durationMs: performance.now() - started,
+        error: getErrorMessage(error),
+      })
+      throw error
+    }
+  })
+}
+
+const fixtures: {
+  userId: string
+  workspaceId: string
+  fileId: string
+  originWorkspaceId?: string
+}[] = []
+beforeEach(() => {
+  featureFlagsMockFns.mockIsFeatureEnabled.mockImplementation(async (flag) => flag === 'projects')
+  vi.stubEnv('PROJECT_FILES_ENABLED', 'true')
+})
+async function fixture(crossProject = false) {
+  const userId = generateId()
+  const workspaceId = generateId()
+  const chatId = generateId()
+  const fileId = generateId()
+  await db.insert(user).values({
+    id: userId,
+    name: 'Resource reader',
+    email: `${userId}@project-context.invalid`,
+    emailVerified: true,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  })
+  await insertWorkspaceFixture(db, {
+    id: workspaceId,
+    ownerId: userId,
+    billedAccountUserId: userId,
+    name: 'Context workspace',
+  })
+  await db.insert(permissions).values({
+    id: generateId(),
+    userId,
+    entityType: 'workspace',
+    entityId: workspaceId,
+    permissionType: 'admin',
+  })
+  const [binding] = await db
+    .select()
+    .from(projectWorkspace)
+    .where(eq(projectWorkspace.workspaceId, workspaceId))
+  if (!binding) throw new Error('Project binding missing')
+  const projectId = binding.projectId
+  const originWorkspaceId = crossProject ? generateId() : workspaceId
+  if (crossProject) {
+    await insertWorkspaceFixture(db, {
+      id: originWorkspaceId,
+      ownerId: userId,
+      billedAccountUserId: userId,
+      name: 'Origin in another Project',
+    })
+    await db.insert(permissions).values({
+      id: generateId(),
+      userId,
+      entityType: 'workspace',
+      entityId: originWorkspaceId,
+      permissionType: 'read',
+    })
+  }
+  fixtures.push({ userId, workspaceId, fileId, originWorkspaceId })
+  await db
+    .insert(copilotChats)
+    .values({ id: chatId, userId, workspaceId: originWorkspaceId, type: 'mothership' })
+  await db.insert(workspaceFiles).values({
+    id: fileId,
+    projectId: projectId,
+    key: `project/${projectId}/context.md`,
+    userId,
+    context: 'project',
+    originalName: 'Canonical.md',
+    contentType: 'text/markdown',
+    sizeBytes: 8,
+  })
+  const owner = { entityType: 'project' as const, entityId: projectId }
+  const context = {
+    userId,
+    chatId,
+    workflowId: '',
+    requestMode: 'agent',
+    toolCallId: generateId(),
+    copilotToolExecution: true,
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId,
+      invocation: { kind: 'chat', chatId },
+    }),
+  }
+  return {
+    userId,
+    workspaceId: originWorkspaceId,
+    targetWorkspaceId: workspaceId,
+    projectId,
+    chatId,
+    fileId,
+    owner,
+    context,
+  }
+}
+
+describe('Project resource context and opening use canonical metadata and current authority', () => {
+  identityCheck(
+    'opens a different Project from the chat origin and rechecks reconstructed resume admission',
+    async () => {
+      const f = await fixture(true)
+      registerHandler('open_resource', createServerToolHandler('open_resource'))
+      const result = await executeTool(
+        'open_resource',
+        { resources: [{ type: 'file', id: f.fileId, owner: f.owner }] },
+        f.context
+      )
+      expect(result.success, result.error).toBe(true)
+      expect(result.resources).toEqual([
+        { type: 'file', id: f.fileId, title: 'Canonical.md', owner: f.owner },
+      ])
+      await db
+        .delete(permissions)
+        .where(and(eq(permissions.userId, f.userId), eq(permissions.entityId, f.targetWorkspaceId)))
+      const resumed = {
+        ...f.context,
+        toolCallId: generateId(),
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: f.userId,
+          invocation: { kind: 'chat' as const, chatId: f.chatId },
+        }),
+      }
+      const revoked = await executeTool(
+        'open_resource',
+        { resources: [{ type: 'file', id: f.fileId, owner: f.owner }] },
+        resumed
+      )
+      expect(revoked.success).toBe(false)
+      expect(revoked.resources).toBeUndefined()
+    }
+  )
+
+  identityCheck(
+    'cross-Project file and selection context retain their owner through authorized resolution and message persistence',
+    async () => {
+      const f = await fixture(true)
+      const selected = {
+        kind: 'file_selection' as const,
+        fileId: f.fileId,
+        owner: f.owner,
+        label: 'Selection',
+        fileName: 'Forged.md',
+        text: 'User-selected text',
+        startLine: 2,
+      }
+      for (const requestMode of [undefined, 'execute', 'assistant', 'build'])
+        expect(
+          await processContextsServer(
+            [selected],
+            f.userId,
+            '',
+            f.workspaceId,
+            f.chatId,
+            undefined,
+            undefined,
+            requestMode
+          )
+        ).toEqual([])
+      const planned = await processContextsServer(
+        [selected],
+        f.userId,
+        '',
+        f.workspaceId,
+        f.chatId,
+        undefined,
+        undefined,
+        'plan'
+      )
+      expect(planned).toHaveLength(1)
+      const contexts = await processContextsServer(
+        [{ kind: 'file', fileId: f.fileId, label: 'File', owner: f.owner }, selected],
+        f.userId,
+        '',
+        f.workspaceId,
+        f.chatId,
+        undefined,
+        undefined,
+        'agent'
+      )
+      expect(contexts).toHaveLength(2)
+      for (const context of contexts)
+        expect(context).toMatchObject({
+          resource: { type: 'file', id: f.fileId, title: 'Canonical.md', owner: f.owner },
+        })
+      expect(contexts[1]?.content).toContain('Canonical.md')
+      expect(copyPersistedMessageContext(selected)).toMatchObject({ owner: f.owner })
+      await db
+        .delete(permissions)
+        .where(and(eq(permissions.userId, f.userId), eq(permissions.entityId, f.targetWorkspaceId)))
+      expect(
+        await processContextsServer(
+          [selected],
+          f.userId,
+          '',
+          f.workspaceId,
+          f.chatId,
+          undefined,
+          undefined,
+          'agent'
+        )
+      ).toEqual([])
+    }
+  )
+
+  it('persists Project effect identity and cannot remove it using another owner', async () => {
+    const f = await fixture()
+    const resource = { type: 'file' as const, id: f.fileId, title: 'Canonical.md', owner: f.owner }
+    await persistResourceEffect(f.chatId, { op: 'upsert', effectId: 'open', resource })
+    for (const wrongOwner of [
+      { ...f.owner, entityId: generateId() },
+      { entityType: 'workspace' as const, entityId: f.owner.entityId },
+    ])
+      await persistResourceEffect(f.chatId, {
+        op: 'remove',
+        effectId: `wrong-owner:${wrongOwner.entityType}`,
+        resource: { ...resource, owner: wrongOwner },
+      })
+    const [stored] = await db
+      .select({ resources: copilotChats.resources })
+      .from(copilotChats)
+      .where(eq(copilotChats.id, f.chatId))
+    expect(stored?.resources).toEqual([resource])
+    await persistResourceEffect(f.chatId, { op: 'remove', effectId: 'close', resource })
+    await persistResourceEffect(f.chatId, { op: 'upsert', effectId: 'open', resource })
+    const [replayed] = await db
+      .select({ resources: copilotChats.resources })
+      .from(copilotChats)
+      .where(eq(copilotChats.id, f.chatId))
+    expect(replayed?.resources).toEqual([])
+  })
+
+  it('rejects contradictory owners, mixed batches and caller-supplied canonical metadata', async () => {
+    const f = await fixture()
+    registerHandler('open_resource', createServerToolHandler('open_resource'))
+    const resource = { type: 'file', id: f.fileId, owner: f.owner }
+    for (const input of [
+      { workspaceId: f.workspaceId, resources: [resource] },
+      { resources: [resource, { type: 'workflow', id: 'other' }] },
+      { resources: [{ ...resource, title: 'forged', path: '/secret' }] },
+      { resources: [{ ...resource, owner: { entityType: 'user', entityId: f.userId } }] },
+    ]) {
+      const result = await executeTool('open_resource', input, f.context)
+      expect(result.success).toBe(false)
+      expect(result.resources).toBeUndefined()
+    }
+    const invalidSelection = {
+      kind: 'file_selection' as const,
+      fileId: f.fileId,
+      owner: f.owner,
+      workspaceId: f.workspaceId,
+      label: 'bad',
+      fileName: 'bad',
+      text: 'text',
+    }
+    expect(
+      await processContextsServer(
+        [invalidSelection],
+        f.userId,
+        '',
+        f.workspaceId,
+        f.chatId,
+        undefined,
+        undefined,
+        'agent'
+      )
+    ).toEqual([])
+  })
+})
+
+describe('canonical file panel ownership compatibility', () => {
+  for (const storedKind of ['legacy', 'explicit'] as const) {
+    identityCheck(
+      `removes a ${storedKind} workspace file address through its equivalent owner form`,
+      async () => {
+        const f = await fixture()
+        const legacy: MothershipResource = {
+          type: 'file',
+          id: f.fileId,
+          title: 'Workspace file',
+          workspaceId: f.workspaceId,
+        }
+        const explicit: MothershipResource = {
+          type: 'file',
+          id: f.fileId,
+          title: 'Workspace file',
+          owner: { entityType: 'workspace', entityId: f.workspaceId },
+        }
+        const projectResource: MothershipResource = {
+          type: 'file',
+          id: f.fileId,
+          title: 'Project file',
+          owner: f.owner,
+        }
+        const table: MothershipResource = {
+          type: 'table',
+          id: f.fileId,
+          title: 'Table',
+          workspaceId: f.workspaceId,
+        }
+        await db
+          .update(copilotChats)
+          .set({ resources: [storedKind === 'legacy' ? legacy : explicit, projectResource, table] })
+          .where(eq(copilotChats.id, f.chatId))
+        const result = await changeChatResources.execute({
+          principal: createSessionPrincipal({ userId: f.userId }),
+          input: {
+            chatId: f.chatId,
+            change: { kind: 'remove', resources: [storedKind === 'legacy' ? explicit : legacy] },
+          },
+        })
+        expect(result.resources).toEqual([projectResource, table])
+        const [persisted] = await db
+          .select({ resources: copilotChats.resources, workspaceId: copilotChats.workspaceId })
+          .from(copilotChats)
+          .where(eq(copilotChats.id, f.chatId))
+        expect(persisted).toEqual({
+          resources: [projectResource, table],
+          workspaceId: f.workspaceId,
+        })
+      }
+    )
+  }
+
+  identityCheck(
+    'heals equivalent stored file aliases during upsert and reorder without inventing an owner',
+    async () => {
+      const f = await fixture()
+      const principal = createSessionPrincipal({ userId: f.userId })
+      const legacy: MothershipResource = {
+        type: 'file',
+        id: f.fileId,
+        title: 'Notes',
+        workspaceId: f.workspaceId,
+      }
+      const explicit: MothershipResource = {
+        type: 'file',
+        id: f.fileId,
+        title: 'Notes',
+        owner: { entityType: 'workspace', entityId: f.workspaceId },
+      }
+      const implicit: MothershipResource = {
+        type: 'file',
+        id: generateId(),
+        title: 'Old unresolved panel',
+      }
+      const table: MothershipResource = {
+        type: 'table',
+        id: generateId(),
+        title: 'Table',
+        workspaceId: f.workspaceId,
+        viewId: generateId(),
+      }
+      await db
+        .update(copilotChats)
+        .set({ resources: [legacy, implicit, table] })
+        .where(eq(copilotChats.id, f.chatId))
+      const added = await changeChatResources.execute({
+        principal,
+        input: { chatId: f.chatId, change: { kind: 'upsert', resources: [explicit] } },
+      })
+      expect(added.resources).toEqual([explicit, implicit, table])
+      const reordered = await changeChatResources.execute({
+        principal,
+        input: {
+          chatId: f.chatId,
+          change: { kind: 'reorder', resources: [table, legacy, implicit] },
+        },
+      })
+      expect(reordered.resources).toEqual([table, explicit, implicit])
+      const [stored] = await db
+        .select({ resources: copilotChats.resources })
+        .from(copilotChats)
+        .where(eq(copilotChats.id, f.chatId))
+      expect(stored?.resources).toEqual([table, explicit, implicit])
+    }
+  )
+
+  identityCheck(
+    'rejects conflicting or unsupported file removal owners at both HTTP route boundaries',
+    async () => {
+      const f = await fixture()
+      authMockFns.mockGetSession.mockResolvedValue({
+        user: { id: f.userId },
+        session: { id: generateId() },
+      })
+      const resource: MothershipResource = {
+        type: 'file',
+        id: f.fileId,
+        title: 'Project file',
+        owner: f.owner,
+      }
+      await db
+        .update(copilotChats)
+        .set({ resources: [resource] })
+        .where(eq(copilotChats.id, f.chatId))
+      for (const [path, handler] of [
+        ['/api/copilot/chat/resources', removeCopilotResource],
+        ['/api/mothership/chat/resources', removeMothershipResource],
+      ] as const) {
+        for (const address of [
+          { owner: f.owner, workspaceId: f.workspaceId },
+          {
+            owner: { entityType: 'workspace', entityId: generateId() },
+            workspaceId: f.workspaceId,
+          },
+          { owner: { entityType: 'organization', entityId: generateId() } },
+          { owner: f.owner, resourceType: 'table' },
+        ]) {
+          const response = await handler(
+            createMockRequest({
+              method: 'DELETE',
+              url: `http://localhost${path}`,
+              body: {
+                chatId: f.chatId,
+                resourceType: 'file',
+                resourceId: f.fileId,
+                ...address,
+              },
+            }),
+            undefined
+          )
+          expect(
+            response.status,
+            JSON.stringify({ path, address, body: await response.json() })
+          ).toBe(400)
+        }
+      }
+      const [stored] = await db
+        .select({ resources: copilotChats.resources })
+        .from(copilotChats)
+        .where(eq(copilotChats.id, f.chatId))
+      expect(stored?.resources).toEqual([resource])
+    }
+  )
+})
+
+describe('legacy browser file address compatibility', () => {
+  identityCheck(
+    'persists and hydrates owned file folders without mixing their owner addresses',
+    async () => {
+      const f = await fixture()
+      authMockFns.mockGetSession.mockResolvedValue({
+        user: { id: f.userId },
+        session: { id: generateId() },
+      })
+      const folderId = generateId()
+      const resources: MothershipResource[] = [
+        {
+          type: 'filefolder',
+          id: folderId,
+          title: 'Workspace folder',
+          owner: { entityType: 'workspace', entityId: f.workspaceId },
+        },
+        { type: 'filefolder', id: folderId, title: 'Project folder', owner: f.owner },
+      ]
+      for (const resource of resources) {
+        const response = await addCopilotResource(
+          createMockRequest({
+            method: 'POST',
+            url: 'http://localhost/api/copilot/chat/resources',
+            body: { chatId: f.chatId, resource },
+          }),
+          undefined
+        )
+        expect(response.status, JSON.stringify(await response.json())).toBe(200)
+      }
+      const history = await readMothershipChat(
+        createMockRequest({
+          method: 'GET',
+          url: `http://localhost/api/mothership/chats/${f.chatId}`,
+        }),
+        createRouteContext({ chatId: f.chatId })
+      )
+      expect(history.status).toBe(200)
+      expect(toRecord(toRecord(await history.json()).chat).resources).toEqual([
+        { ...resources[0], workspaceId: f.workspaceId },
+        resources[1],
+      ])
+
+      const removed = await removeMothershipResource(
+        createMockRequest({
+          method: 'DELETE',
+          url: 'http://localhost/api/mothership/chat/resources',
+          body: {
+            chatId: f.chatId,
+            resourceType: 'filefolder',
+            resourceId: folderId,
+            owner: f.owner,
+          },
+        }),
+        undefined
+      )
+      expect(removed.status).toBe(200)
+      const [stored] = await db
+        .select({ resources: copilotChats.resources })
+        .from(copilotChats)
+        .where(eq(copilotChats.id, f.chatId))
+      expect(stored.resources).toEqual([resources[0]])
+
+      const conflicting = await addCopilotResource(
+        createMockRequest({
+          method: 'POST',
+          url: 'http://localhost/api/copilot/chat/resources',
+          body: { chatId: f.chatId, resource: { ...resources[1], workspaceId: f.workspaceId } },
+        }),
+        undefined
+      )
+      expect(conflicting.status).toBe(400)
+    }
+  )
+
+  identityCheck(
+    'projects Workspace aliases only in HTTP responses while keeping canonical storage',
+    async () => {
+      const f = await fixture()
+      authMockFns.mockGetSession.mockResolvedValue({
+        user: { id: f.userId },
+        session: { id: generateId() },
+      })
+      const workspaceFile: MothershipResource = {
+        type: 'file',
+        id: generateId(),
+        title: 'Workspace notes',
+        owner: { entityType: 'workspace', entityId: f.workspaceId },
+      }
+      const projectFile: MothershipResource = {
+        type: 'file',
+        id: f.fileId,
+        title: 'Project notes',
+        owner: f.owner,
+      }
+      const ownerlessFile: MothershipResource = {
+        type: 'file',
+        id: generateId(),
+        title: 'Legacy unresolved file',
+      }
+      const table: MothershipResource = {
+        type: 'table',
+        id: generateId(),
+        title: 'Table',
+        workspaceId: f.workspaceId,
+      }
+      const canonical = [workspaceFile, projectFile, ownerlessFile, table]
+      await db
+        .update(copilotChats)
+        .set({ resources: canonical })
+        .where(eq(copilotChats.id, f.chatId))
+      const expectedWire = [
+        { ...workspaceFile, workspaceId: f.workspaceId },
+        projectFile,
+        ownerlessFile,
+        table,
+      ]
+      const history = await readMothershipChat(
+        createMockRequest({
+          method: 'GET',
+          url: `http://localhost/api/mothership/chats/${f.chatId}`,
+        }),
+        createRouteContext({ chatId: f.chatId })
+      )
+      expect(history.status).toBe(200)
+      const historyBody = toRecord(await history.json())
+      expect(toRecord(historyBody.chat).resources).toEqual(expectedWire)
+      const mutation = await addCopilotResource(
+        createMockRequest({
+          method: 'POST',
+          url: 'http://localhost/api/copilot/chat/resources',
+          body: { chatId: f.chatId, resource: workspaceFile },
+        }),
+        undefined
+      )
+      expect(mutation.status).toBe(200)
+      expect(toRecord(await mutation.json()).resources).toEqual(expectedWire)
+      const [stored] = await db
+        .select({ resources: copilotChats.resources })
+        .from(copilotChats)
+        .where(eq(copilotChats.id, f.chatId))
+      expect(stored?.resources).toEqual(canonical)
+    }
+  )
+
+  identityCheck(
+    'projects Workspace aliases in the shared live and replay encoder without mutating events',
+    async () => {
+      const workspaceId = generateId()
+      const workspaceFile: MothershipResource = {
+        type: 'file',
+        id: generateId(),
+        title: 'Workspace file',
+        owner: { entityType: 'workspace', entityId: workspaceId },
+      }
+      const projectFile: MothershipResource = {
+        type: 'file',
+        id: generateId(),
+        title: 'Project file',
+        owner: { entityType: 'project', entityId: generateId() },
+      }
+      const ownerless: MothershipResource = { type: 'file', id: generateId(), title: 'Legacy file' }
+      const table: MothershipResource = {
+        type: 'table',
+        id: generateId(),
+        title: 'Table',
+        workspaceId,
+      }
+      for (const resource of [workspaceFile, projectFile, ownerless, table]) {
+        const event = createEvent({
+          streamId: generateId(),
+          cursor: '0',
+          seq: 0,
+          requestId: generateId(),
+          type: 'resource',
+          payload: { op: 'upsert', resource },
+        })
+        const canonical = structuredClone(event)
+        const encoded = new TextDecoder().decode(encodeSSEEnvelope(event))
+        expect(encoded.startsWith('data: ')).toBe(true)
+        expect(encoded.endsWith('\n\n')).toBe(true)
+        const frame = toRecord(JSON.parse(encoded.slice(6).trim()))
+        const expected = resource === workspaceFile ? { ...resource, workspaceId } : resource
+        expect(toRecord(frame.payload).resource).toEqual(expected)
+        expect(event).toEqual(canonical)
+      }
+    }
+  )
+})
+
+afterAll(async () => {
+  const reportPath = process.env.CHAT_RESOURCE_IDENTITY_REPORT_PATH
+  if (reportPath) {
+    await mkdir(dirname(reportPath), { recursive: true })
+    await writeFile(reportPath, JSON.stringify({ checks: identityChecks }, null, 2))
+  }
+  for (const f of fixtures) {
+    await db.delete(workspaceFiles).where(eq(workspaceFiles.id, f.fileId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, f.workspaceId))
+    if (f.originWorkspaceId && f.originWorkspaceId !== f.workspaceId)
+      await deleteWorkspaceFixture(db, eq(workspace.id, f.originWorkspaceId))
+    await db.delete(user).where(eq(user.id, f.userId))
+  }
+  await db.$client.end()
+})
diff --git a/apps/sim/lib/mothership/chat/selection-clipboard.test.ts b/apps/sim/lib/mothership/chat/selection-clipboard.test.ts
index 0f4082476a5..b4254d1b99e 100644
--- a/apps/sim/lib/mothership/chat/selection-clipboard.test.ts
+++ b/apps/sim/lib/mothership/chat/selection-clipboard.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import type { ChatContext } from '@/stores/panel'
 import {
   attachSelectionContextToClipboard,
   readSelectionContextFromClipboard,
   SIM_SELECTION_MIME,
-} from './selection-clipboard'
+} from '@/lib/mothership/chat/selection-clipboard'
+import type { ChatContext } from '@/stores/panel'
 
 /** Minimal DataTransfer stand-in (jsdom-free node env). */
 function fakeClipboard(initial: Record<string, string> = {}) {
@@ -44,13 +44,19 @@ describe('selection clipboard codec', () => {
     const dt = fakeClipboard()
     attachSelectionContextToClipboard(dt, fileSelection, 'ws-1')
     expect(dt.getData(SIM_SELECTION_MIME)).toContain('file_selection')
-    expect(readSelectionContextFromClipboard(dt, 'ws-1')).toEqual(fileSelection)
+    expect(readSelectionContextFromClipboard(dt, 'ws-1')).toEqual({
+      ...fileSelection,
+      workspaceId: 'ws-1',
+    })
   })
 
   it('round-trips a table selection', () => {
     const dt = fakeClipboard()
     attachSelectionContextToClipboard(dt, tableSelection, 'ws-1')
-    expect(readSelectionContextFromClipboard(dt, 'ws-1')).toEqual(tableSelection)
+    expect(readSelectionContextFromClipboard(dt, 'ws-1')).toEqual({
+      ...tableSelection,
+      workspaceId: 'ws-1',
+    })
   })
 
   it('does not touch text/plain (rides alongside it)', () => {
@@ -137,3 +143,46 @@ describe('selection clipboard codec', () => {
     expect(readSelectionContextFromClipboard(dt, 'ws-1')).toBeNull()
   })
 })
+
+it('admits Project selections only among explicit destination owners and rejects forged context ownership', () => {
+  const owner = { entityType: 'project' as const, entityId: 'project-1' }
+  const context = { ...fileSelection, owner }
+  const dt = fakeClipboard()
+  attachSelectionContextToClipboard(dt, context, owner)
+  expect(
+    readSelectionContextFromClipboard(dt, [{ entityType: 'workspace', entityId: 'ws-1' }, owner])
+  ).toEqual(context)
+  expect(readSelectionContextFromClipboard(dt, [])).toBeNull()
+  expect(readSelectionContextFromClipboard(dt, 'ws-1')).toBeNull()
+  expect(readSelectionContextFromClipboard(dt, [{ ...owner, entityId: 'project-2' }])).toBeNull()
+  attachSelectionContextToClipboard(
+    dt,
+    { ...context, owner: { ...owner, entityId: 'project-2' } },
+    owner
+  )
+  expect(readSelectionContextFromClipboard(dt, [owner])).toBeNull()
+  dt.setData(
+    SIM_SELECTION_MIME,
+    JSON.stringify({ version: 1, owner: null, sourceWorkspaceId: 'ws-1', context: fileSelection })
+  )
+  expect(readSelectionContextFromClipboard(dt, 'ws-1')).toBeNull()
+  dt.setData(
+    SIM_SELECTION_MIME,
+    JSON.stringify({ version: 1, owner, sourceWorkspaceId: 'ws-1', context })
+  )
+  expect(readSelectionContextFromClipboard(dt, [owner])).toBeNull()
+})
+
+it('retains the admitted workspace address in organization-chat selections and rejects conflicting context scope', () => {
+  const owners = [{ entityType: 'workspace' as const, entityId: 'ws-1' }]
+  const dt = fakeClipboard()
+  for (const context of [fileSelection, tableSelection]) {
+    attachSelectionContextToClipboard(dt, context, 'ws-1')
+    expect(readSelectionContextFromClipboard(dt, owners)).toEqual({
+      ...context,
+      workspaceId: 'ws-1',
+    })
+    attachSelectionContextToClipboard(dt, { ...context, workspaceId: 'ws-2' }, 'ws-1')
+    expect(readSelectionContextFromClipboard(dt, owners)).toBeNull()
+  }
+})
diff --git a/apps/sim/lib/mothership/chat/selection-clipboard.ts b/apps/sim/lib/mothership/chat/selection-clipboard.ts
index 333d1f420e5..075fadb3e96 100644
--- a/apps/sim/lib/mothership/chat/selection-clipboard.ts
+++ b/apps/sim/lib/mothership/chat/selection-clipboard.ts
@@ -1,3 +1,8 @@
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
 import type { ChatContext } from '@/stores/panel'
 
 /**
@@ -12,10 +17,36 @@ const SIM_SELECTION_CLIPBOARD_VERSION = 1
 
 interface SelectionClipboardEnvelope {
   version: typeof SIM_SELECTION_CLIPBOARD_VERSION
-  sourceWorkspaceId: string
+  sourceWorkspaceId?: string
+  owner?: FileOperationOwner
   context: ChatContext
 }
 
+type ClipboardOwnerPolicy = (context: ChatContext, owner: FileOperationOwner) => boolean
+
+const CLIPBOARD_OWNER_POLICIES: FileOwnerAdapters<ClipboardOwnerPolicy> = {
+  workspace(context, owner) {
+    if ('workspaceId' in context && context.workspaceId && context.workspaceId !== owner.entityId)
+      return false
+    if (context.kind !== 'file_selection' || !context.owner) return true
+    const parsed = FileOperationOwner.safeParse(context.owner)
+    return (
+      parsed.success &&
+      parsed.data.entityType === owner.entityType &&
+      parsed.data.entityId === owner.entityId
+    )
+  },
+  project(context, owner) {
+    if (context.kind !== 'file_selection' || context.workspaceId) return false
+    const parsed = FileOperationOwner.safeParse(context.owner)
+    return (
+      parsed.success &&
+      parsed.data.entityType === owner.entityType &&
+      parsed.data.entityId === owner.entityId
+    )
+  },
+}
+
 /**
  * Attaches a selection context to a copy event's clipboard. Adds the custom MIME
  * type WITHOUT calling `preventDefault`, so the editor's own copy handler (Monaco,
@@ -25,13 +56,15 @@ interface SelectionClipboardEnvelope {
 export function attachSelectionContextToClipboard(
   clipboardData: DataTransfer | null,
   context: ChatContext,
-  sourceWorkspaceId: string
+  sourceWorkspaceId: string | FileOperationOwner
 ): void {
   if (!clipboardData || !sourceWorkspaceId) return
   try {
     const envelope: SelectionClipboardEnvelope = {
       version: SIM_SELECTION_CLIPBOARD_VERSION,
-      sourceWorkspaceId,
+      ...(typeof sourceWorkspaceId === 'string'
+        ? { sourceWorkspaceId }
+        : { owner: sourceWorkspaceId }),
       context,
     }
     clipboardData.setData(SIM_SELECTION_MIME, JSON.stringify(envelope))
@@ -47,20 +80,43 @@ export function attachSelectionContextToClipboard(
  */
 export function readSelectionContextFromClipboard(
   clipboardData: DataTransfer | null,
-  destinationWorkspaceId: string
+  destinationWorkspaceId: string | FileOperationOwner | readonly FileOperationOwner[]
 ): ChatContext | null {
   const raw = clipboardData?.getData(SIM_SELECTION_MIME)
   if (!raw) return null
   try {
     const envelope = JSON.parse(raw) as Partial<SelectionClipboardEnvelope>
-    if (
-      envelope.version !== SIM_SELECTION_CLIPBOARD_VERSION ||
-      envelope.sourceWorkspaceId !== destinationWorkspaceId
-    ) {
+    if (envelope.version !== SIM_SELECTION_CLIPBOARD_VERSION) {
       return null
     }
+    if (envelope.owner !== undefined && envelope.sourceWorkspaceId !== undefined) return null
+    const sourceOwner = FileOperationOwner.safeParse(
+      envelope.owner !== undefined
+        ? envelope.owner
+        : { entityType: 'workspace', entityId: envelope.sourceWorkspaceId }
+    )
+    if (!sourceOwner.success) return null
+    const destinations =
+      typeof destinationWorkspaceId === 'string'
+        ? [{ entityType: 'workspace', entityId: destinationWorkspaceId }]
+        : Array.isArray(destinationWorkspaceId)
+          ? destinationWorkspaceId
+          : [destinationWorkspaceId]
+    if (
+      !destinations.some((candidate) => {
+        const destination = FileOperationOwner.safeParse(candidate)
+        return (
+          destination.success &&
+          sourceOwner.data.entityType === destination.data.entityType &&
+          sourceOwner.data.entityId === destination.data.entityId
+        )
+      })
+    )
+      return null
     const parsed = envelope.context
     if (!parsed || typeof parsed !== 'object' || typeof parsed.label !== 'string') return null
+    const accepts = requireFileOwnerAdapter(CLIPBOARD_OWNER_POLICIES, sourceOwner.data)
+    if (!accepts(parsed, sourceOwner.data)) return null
     // Require each kind's resolving field so a chip never pastes only to
     // resolve to nothing server-side.
     if (
@@ -69,7 +125,9 @@ export function readSelectionContextFromClipboard(
       typeof parsed.fileName === 'string' &&
       parsed.fileId
     ) {
-      return parsed
+      return sourceOwner.data.entityType === 'workspace'
+        ? { ...parsed, workspaceId: sourceOwner.data.entityId }
+        : parsed
     }
     if (
       parsed.kind === 'table_selection' &&
@@ -78,7 +136,9 @@ export function readSelectionContextFromClipboard(
       Array.isArray(parsed.rowIds) &&
       parsed.rowIds.length > 0
     ) {
-      return parsed
+      return sourceOwner.data.entityType === 'workspace'
+        ? { ...parsed, workspaceId: sourceOwner.data.entityId }
+        : parsed
     }
   } catch {
     // Malformed payload — fall back to plain-text paste.
diff --git a/apps/sim/lib/mothership/file-owners/index.ts b/apps/sim/lib/mothership/file-owners/index.ts
new file mode 100644
index 00000000000..be443d69362
--- /dev/null
+++ b/apps/sim/lib/mothership/file-owners/index.ts
@@ -0,0 +1 @@
+export { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners/registry'
diff --git a/apps/sim/lib/mothership/file-owners/project.ts b/apps/sim/lib/mothership/file-owners/project.ts
new file mode 100644
index 00000000000..7d342a16f8b
--- /dev/null
+++ b/apps/sim/lib/mothership/file-owners/project.ts
@@ -0,0 +1,78 @@
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import type { CopilotFileOwnerAdapter } from '@/lib/mothership/file-owners/types'
+import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils'
+import {
+  getProjectFileCapabilities,
+  getProjectFileMetadata,
+} from '@/lib/projects/files/application'
+import { fileOwnerVfsPath } from '@/lib/workspace-files/owner-paths'
+
+export const projectFileOwnerAdapter: CopilotFileOwnerAdapter = {
+  resourceScope: 'owner',
+  async readChatMetadata(ingress, target) {
+    if (ingress.requestMode !== 'agent' && ingress.requestMode !== 'plan') {
+      throw new OrchestrationError('forbidden', 'Project file context requires agent or plan mode')
+    }
+    const invocation = ingress.chatId
+      ? { kind: 'chat' as const, chatId: ingress.chatId }
+      : ingress.workspaceId
+        ? { kind: 'workspace' as const, workspaceId: ingress.workspaceId }
+        : null
+    if (!invocation) {
+      throw new OrchestrationError('forbidden', 'File context requires an authoring invocation')
+    }
+    const context = {
+      ...ingress,
+      toolCallId: `context:${target.fileId}`,
+      copilotToolExecution: true,
+      copilotResourceAdmission: createCopilotResourceAdmission({
+        userId: ingress.userId,
+        invocation,
+      }),
+    }
+    const input = { projectId: target.owner.entityId, fileId: target.fileId }
+    const { file } = await executeCopilotProjectFileUseCase(
+      context,
+      getProjectFileMetadata,
+      input,
+      input
+    )
+    return {
+      id: file.id,
+      name: file.name,
+      owner: file.owner,
+      path: fileOwnerVfsPath(
+        file.owner,
+        canonicalWorkspaceFilePath({ folderPath: file.folderPath, name: file.name })
+      ),
+    }
+  },
+  async executeCli(request, context, owner) {
+    if (request.workspaceId !== undefined) {
+      throw new OrchestrationError(
+        'validation',
+        'A Project file target cannot also select a workspace'
+      )
+    }
+    const { executeProjectFileCliRequest } = await import(
+      '@/lib/mothership/agent-cli/project-files'
+    )
+    return executeProjectFileCliRequest(request, context, owner.entityId)
+  },
+  async readMetadata(context, { owner, fileId }) {
+    const target = { projectId: owner.entityId, fileId }
+    const { file } = await executeCopilotProjectFileUseCase(
+      context,
+      getProjectFileMetadata,
+      target,
+      target
+    )
+    return { id: file.id, name: file.name, owner: file.owner }
+  },
+  capabilities(context, owner) {
+    const target = { projectId: owner.entityId }
+    return executeCopilotProjectFileUseCase(context, getProjectFileCapabilities, target, target)
+  },
+}
diff --git a/apps/sim/lib/mothership/file-owners/registry.ts b/apps/sim/lib/mothership/file-owners/registry.ts
new file mode 100644
index 00000000000..318e8b5590f
--- /dev/null
+++ b/apps/sim/lib/mothership/file-owners/registry.ts
@@ -0,0 +1,18 @@
+import { projectFileOwnerAdapter } from '@/lib/mothership/file-owners/project'
+import type { CopilotFileOwnerAdapter } from '@/lib/mothership/file-owners/types'
+import { workspaceFileOwnerAdapter } from '@/lib/mothership/file-owners/workspace'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { FileOwner } from '@/lib/workspace-files/ownership'
+
+const adapters: FileOwnerAdapters<CopilotFileOwnerAdapter> = Object.freeze({
+  workspace: workspaceFileOwnerAdapter,
+  project: projectFileOwnerAdapter,
+})
+
+/** Selects owner policy without deriving file ownership from conversation context. */
+export function getCopilotFileOwnerAdapter(owner: FileOwner): CopilotFileOwnerAdapter {
+  return requireFileOwnerAdapter(adapters, owner)
+}
diff --git a/apps/sim/lib/mothership/file-owners/types.ts b/apps/sim/lib/mothership/file-owners/types.ts
new file mode 100644
index 00000000000..a11d2dc449a
--- /dev/null
+++ b/apps/sim/lib/mothership/file-owners/types.ts
@@ -0,0 +1,38 @@
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import type { CopilotExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import type { AgentCliRawResult, AgentCliRequest } from '@/lib/mothership/generated/agent-cli'
+import type { FileOwnerContext } from '@/lib/mothership/generated/file-owner'
+import type { EditableFileOwner, FileOwner, OwnedFileTarget } from '@/lib/workspace-files/ownership'
+
+export interface ChatFileIngress {
+  userId: string
+  workspaceId?: string
+  chatId?: string
+  requestMode?: string
+}
+
+interface ChatFileMetadata {
+  id: string
+  name: string
+  owner: EditableFileOwner
+  path: string
+}
+
+export interface CopilotFileOwnerAdapter {
+  /** Legacy workspace resources share an invocation with other workspace resource kinds. */
+  resourceScope: 'workspace' | 'owner'
+  executeCli(
+    request: AgentCliRequest,
+    context: AgentCliExecutionContext,
+    owner: FileOwner
+  ): Promise<AgentCliRawResult>
+  readMetadata(
+    context: CopilotExecutionContext | undefined,
+    target: OwnedFileTarget
+  ): Promise<{ id: string; name: string; owner: EditableFileOwner }>
+  readChatMetadata(ingress: ChatFileIngress, target: OwnedFileTarget): Promise<ChatFileMetadata>
+  capabilities?(
+    context: CopilotExecutionContext,
+    owner: FileOwner
+  ): Promise<FileOwnerContext['fileOwnerCapabilities'][number]>
+}
diff --git a/apps/sim/lib/mothership/file-owners/workspace.ts b/apps/sim/lib/mothership/file-owners/workspace.ts
new file mode 100644
index 00000000000..e8eb7e366c4
--- /dev/null
+++ b/apps/sim/lib/mothership/file-owners/workspace.ts
@@ -0,0 +1,62 @@
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { executeCopilotFileUseCase } from '@/lib/mothership/application/execute-file-use-case'
+import { requireTrustedCopilotExecutionContext } from '@/lib/mothership/auth/application-delegation'
+import { createCopilotChatFilePrincipal } from '@/lib/mothership/auth/file-delegation'
+import type { CopilotFileOwnerAdapter } from '@/lib/mothership/file-owners/types'
+import { canonicalWorkspaceFilePath } from '@/lib/mothership/vfs/path-utils'
+import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata'
+import { fileOwnerVfsPath } from '@/lib/workspace-files/owner-paths'
+
+export const workspaceFileOwnerAdapter: CopilotFileOwnerAdapter = {
+  resourceScope: 'workspace',
+  async readChatMetadata(ingress, target) {
+    if (ingress.workspaceId !== target.owner.entityId) {
+      throw new OrchestrationError('not_found', 'File owner not found in this invocation')
+    }
+    const principal = createCopilotChatFilePrincipal({
+      userId: ingress.userId,
+      workspaceId: target.owner.entityId,
+      chatId: ingress.chatId,
+    })
+    const { file } = await readWorkspaceFileMetadata.execute({
+      principal,
+      input: { fileId: target.fileId, assertedWorkspaceId: target.owner.entityId },
+    })
+    return {
+      id: file.id,
+      name: file.name,
+      owner: { entityType: 'workspace', entityId: target.owner.entityId },
+      path: fileOwnerVfsPath(
+        target.owner,
+        canonicalWorkspaceFilePath({ folderPath: file.folderPath, name: file.name })
+      ),
+    }
+  },
+  async executeCli(request, context, owner) {
+    if (request.workspaceId !== undefined && request.workspaceId !== owner.entityId) {
+      throw new OrchestrationError(
+        'validation',
+        'Workspace file owner does not match the invocation target'
+      )
+    }
+    const { executeWorkspaceCliRequest } = await import('@/lib/mothership/agent-cli/workspace')
+    return executeWorkspaceCliRequest(request, context, owner.entityId)
+  },
+  async readMetadata(context, target) {
+    const trusted = requireTrustedCopilotExecutionContext(context)
+    if (trusted.workspaceId !== target.owner.entityId) {
+      throw new OrchestrationError('not_found', 'File owner not found in this invocation')
+    }
+    const { file } = await executeCopilotFileUseCase(
+      context,
+      readWorkspaceFileMetadata,
+      { fileId: target.fileId, assertedWorkspaceId: target.owner.entityId },
+      { fileId: target.fileId }
+    )
+    return {
+      id: target.fileId,
+      name: file.name,
+      owner: { entityType: 'workspace', entityId: target.owner.entityId },
+    }
+  },
+}
diff --git a/apps/sim/lib/mothership/generated/agent-cli.ts b/apps/sim/lib/mothership/generated/agent-cli.ts
index 988ea2fb4ff..2313a3067e3 100644
--- a/apps/sim/lib/mothership/generated/agent-cli.ts
+++ b/apps/sim/lib/mothership/generated/agent-cli.ts
@@ -11,8 +11,10 @@
  */
 
 import { z } from "zod";
+import { FileOperationOwner } from "./file-owner";
 import { ArtifactObservations } from "./observations";
 import { ResourceChanges } from "./resources";
+import { fileCopyDestinationSchema, fileCopySourceSchema } from "./sim-file-copy.generated";
 
 /** Relative sink paths resolve under the chat workbench home. */
 export const AgentCliSandboxFileSink = z.object({
@@ -48,6 +50,7 @@ export const AgentCliServiceInvocation = z.object({
   kind: z.literal("service"),
   name: z.enum([
     "list_workspaces",
+    "list_user_projects",
     "search_workspace",
     "read_document",
     "settings",
@@ -60,20 +63,38 @@ export const AgentCliServiceInvocation = z.object({
 });
 export type AgentCliServiceInvocation = z.infer<typeof AgentCliServiceInvocation>;
 
+export const AgentCliFileCopyInvocation = z.strictObject({
+  kind: z.literal("file-copy"),
+  argv: AgentCliCliInvocation.shape.argv,
+  source: fileCopySourceSchema,
+  destination: fileCopyDestinationSchema,
+});
+export type AgentCliFileCopyInvocation = z.infer<typeof AgentCliFileCopyInvocation>;
+
 export const AgentCliInvocation = z.discriminatedUnion("kind", [
   AgentCliCliInvocation,
+  AgentCliFileCopyInvocation,
   AgentCliAugmentationInvocation,
   AgentCliStdoutInvocation,
   AgentCliServiceInvocation,
 ]);
 export type AgentCliInvocation = z.infer<typeof AgentCliInvocation>;
 
-export const AgentCliRequest = z.object({
-  workspaceId: z.uuid().optional(),
-  invocation: AgentCliInvocation,
-  sink: AgentCliSandboxFileSink.optional(),
-  curate: z.enum(["block", "knowledge-documents"]).optional(),
-});
+export const AgentCliRequest = z
+  .object({
+    fileOwner: FileOperationOwner.optional(),
+    workspaceId: z.uuid().optional(),
+    invocation: AgentCliInvocation,
+    sink: AgentCliSandboxFileSink.optional(),
+    curate: z.enum(["block", "knowledge-documents"]).optional(),
+  })
+  .superRefine((request, context) => {
+    if (request.invocation.kind === "file-copy" && (request.fileOwner || request.workspaceId))
+      context.addIssue({
+        code: "custom",
+        message: "File copy carries both owners in its invocation; omit envelope fileOwner and workspaceId.",
+      });
+  });
 export type AgentCliRequest = z.infer<typeof AgentCliRequest>;
 
 export const AgentCliRawResult = z.object({
diff --git a/apps/sim/lib/mothership/generated/file-owner.ts b/apps/sim/lib/mothership/generated/file-owner.ts
new file mode 100644
index 00000000000..1624ceb2754
--- /dev/null
+++ b/apps/sim/lib/mothership/generated/file-owner.ts
@@ -0,0 +1,32 @@
+// GENERATED — do not edit. Source of truth: mothership worker packages/contracts/src/file-owner.ts
+// Regenerate with `bun run contracts:sync` in the worker.
+
+import { z } from "zod";
+
+export const FileOwner = z.strictObject({
+  entityType: z.enum(["workspace", "project", "organization", "user"]),
+  entityId: z.string().min(1).max(200),
+});
+export type FileOwner = z.infer<typeof FileOwner>;
+
+export const FileOperationOwner = FileOwner.extend({ entityType: z.enum(["workspace", "project"]) });
+export type FileOperationOwner = z.infer<typeof FileOperationOwner>;
+
+export const FileProjectContext = z.strictObject({
+  id: z.string().min(1).max(200),
+  name: z.string().min(1).max(500),
+});
+
+export const FileOwnerCapability = z.strictObject({
+  owner: FileOwner,
+  canRead: z.boolean(),
+  canWrite: z.boolean(),
+});
+
+/** Sim-computed discovery hints; each operation still requires current Sim authorization. */
+export const FileOwnerContext = z.strictObject({
+  fileOwnerProtocolVersion: z.literal(1),
+  project: FileProjectContext.nullable().optional(),
+  fileOwnerCapabilities: z.array(FileOwnerCapability).max(1000).default([]),
+});
+export type FileOwnerContext = z.infer<typeof FileOwnerContext>;
diff --git a/apps/sim/lib/mothership/generated/observations.ts b/apps/sim/lib/mothership/generated/observations.ts
index 85967464e66..63839b27da6 100644
--- a/apps/sim/lib/mothership/generated/observations.ts
+++ b/apps/sim/lib/mothership/generated/observations.ts
@@ -2,6 +2,7 @@
 // Regenerate with `bun run contracts:sync` in the worker.
 
 import { z } from "zod";
+import { ResourceAddress } from "./resources";
 
 export const ObservationMediaType = z.enum([
   "image/png",
@@ -15,6 +16,7 @@ export const ArtifactObservation = z.object({
   mediaType: ObservationMediaType,
   data: z.string().min(1).max(11_200_000),
   resourceId: z.string().optional(),
+  resource: ResourceAddress.optional(),
   pageCount: z.number().int().min(1).max(20).optional(),
 });
 export type ArtifactObservation = z.infer<typeof ArtifactObservation>;
diff --git a/apps/sim/lib/mothership/generated/protocol.ts b/apps/sim/lib/mothership/generated/protocol.ts
index 5b8a7c07b59..16a8cd494fc 100644
--- a/apps/sim/lib/mothership/generated/protocol.ts
+++ b/apps/sim/lib/mothership/generated/protocol.ts
@@ -1,6 +1,7 @@
 // GENERATED — do not edit. Source of truth: mothership worker packages/contracts/src/protocol.ts
 // Regenerate with `bun run contracts:sync` in the worker.
 
+import { FileOwnerContext } from "./file-owner";
 /**
  * The sim⇄worker wire protocol surface — THE shared source of truth (P3, S31).
  *
@@ -18,6 +19,7 @@
 import { z } from "zod";
 import { AssistantImage, AssistantSearch, AssistantSearchLevel } from "./assistant";
 import { IntegrationCatalogContext } from "./integration-catalog";
+import { ResourceAddress } from "./resources";
 import { SimConnection } from "./sim-transport";
 
 export const PROTOCOL_VERSION = 2;
@@ -178,6 +180,7 @@ export const ChatPayloadSchema = z
           content: z.string(),
           tag: z.string().optional(),
           path: z.string().optional(),
+          resource: ResourceAddress.optional(),
         }),
       )
       .default([]),
@@ -193,6 +196,9 @@ export const ChatPayloadSchema = z
     modelSelection: ModelSelectionSchema.optional(),
     /** Workspace orientation (contracts ChatRequest.inventory): names and ids per world. */
     inventory: WorkspaceInventorySchema.optional(),
+    fileOwnerProtocolVersion: FileOwnerContext.shape.fileOwnerProtocolVersion.optional(),
+    project: FileOwnerContext.shape.project,
+    fileOwnerCapabilities: FileOwnerContext.shape.fileOwnerCapabilities.optional(),
   })
   .superRefine((value, ctx) => {
     if (value.effort === "none" && value.modelSelection?.model !== "gpt-6-sol")
@@ -252,6 +258,9 @@ export interface StreamToolReplay {
 
 /** POST /api/mothership — the chat request sim sends. */
 export interface ChatRequest extends StreamResponseReceipt {
+  fileOwnerProtocolVersion?: 1 | undefined;
+  project?: FileOwnerContext["project"] | undefined;
+  fileOwnerCapabilities?: FileOwnerContext["fileOwnerCapabilities"] | undefined;
   desktop?: DesktopContext | undefined;
   effort?: "none" | "low" | "medium" | "high" | "xhigh" | "max" | undefined;
   modelSelection?: ModelSelection | undefined;
@@ -324,6 +333,8 @@ export interface ChatContextItem {
   content: string;
   tag?: string | undefined;
   path?: string | undefined;
+  /** Requested resource identity; Sim authorizes access independently on every read. */
+  resource?: ResourceAddress | undefined;
 }
 
 /** POST /api/tools/resume — deferred tool results. */
diff --git a/apps/sim/lib/mothership/generated/resources.ts b/apps/sim/lib/mothership/generated/resources.ts
index 33505e8ad5d..b71889b0159 100644
--- a/apps/sim/lib/mothership/generated/resources.ts
+++ b/apps/sim/lib/mothership/generated/resources.ts
@@ -2,6 +2,7 @@
 // Regenerate with `bun run contracts:sync` in the worker.
 
 import { z } from "zod";
+import { FileOwner } from "./file-owner";
 import {
   nativeSearchQueriesSchema,
   workspaceKnowledgeSearchDataSchema,
@@ -40,6 +41,7 @@ export const SearchResource = z.object({
 export type SearchResource = z.infer<typeof SearchResource>;
 
 export const ResourceAddress = z.object({
+  owner: FileOwner.optional(),
   workspaceId: z.uuid().optional(),
   workspaceName: z.string().optional(),
   type: ResourceType,
@@ -90,6 +92,7 @@ export const ResourceChange = z.discriminatedUnion("op", [
     resource: z.union([
       z.object({
         type: ResourceType,
+        owner: FileOwner.optional(),
         workspaceId: z.uuid().optional(),
         id: z.string().regex(/\S/).optional(),
       }),
diff --git a/apps/sim/lib/mothership/generated/sim-assistant-tools.generated.ts b/apps/sim/lib/mothership/generated/sim-assistant-tools.generated.ts
index f09e343936b..870977ba5b7 100644
--- a/apps/sim/lib/mothership/generated/sim-assistant-tools.generated.ts
+++ b/apps/sim/lib/mothership/generated/sim-assistant-tools.generated.ts
@@ -367,8 +367,22 @@ export const listWorkspacesInputSchema = z.object({
   cursor: z.string().uuid().optional().describe('Copy nextCursor from the preceding page.'),
 })
 
+/** Project discovery accepts pagination only; the conversation determines the accessible scope. */
+export const listUserProjectsInputSchema = z.object({
+  cursor: z.string().min(1).optional(),
+  limit: z.number().int().min(1).max(100).default(50),
+})
+export type ListUserProjectsInput = z.output<typeof listUserProjectsInputSchema>
+
 /** Executor identity belongs to Sim; model-facing profile guidance belongs to its caller. */
 export const assistantToolContracts = [
+  {
+    id: 'list_user_projects',
+    route: 'sim',
+    description:
+      'List accessible Projects within this conversation, with visible environments and current capabilities. Follow nextCursor for more results; discovery does not grant file write access.',
+    inputSchema: listUserProjectsInputSchema,
+  },
   {
     id: 'list_workspaces',
     route: 'sim',
diff --git a/apps/sim/lib/mothership/generated/sim-file-copy.generated.ts b/apps/sim/lib/mothership/generated/sim-file-copy.generated.ts
new file mode 100644
index 00000000000..119488ea939
--- /dev/null
+++ b/apps/sim/lib/mothership/generated/sim-file-copy.generated.ts
@@ -0,0 +1,44 @@
+// GENERATED — do not edit. Source: Sim apps/sim/lib/api/contracts/file-copy-input.ts
+// Regenerate with `bun run generate:cli-inventory` in the worker.
+
+import { z } from 'zod'
+const MAX_WORKSPACE_FILE_BULK_REQUEST_IDS = 1000
+
+const copyIdSchema = z.string().trim().min(1).max(200)
+const copyOwnerSchema = z.strictObject({
+  entityType: z.enum(['workspace', 'project']).describe('Resource scope that owns these files.'),
+  entityId: z.string().min(1).max(200).describe('Identifier of the owning workspace or Project.'),
+})
+const copyIdsSchema = z
+  .array(copyIdSchema)
+  .max(MAX_WORKSPACE_FILE_BULK_REQUEST_IDS, 'Too many selected file items')
+  .refine((ids) => new Set(ids).size === ids.length, 'Selected identifiers must be unique')
+  .default([])
+
+export const fileCopySourceSchema = z
+  .strictObject({
+    owner: copyOwnerSchema.describe('Owner from which to read the selected files and folders.'),
+    fileIds: copyIdsSchema.describe('Identifiers of individual files to copy.'),
+    folderIds: copyIdsSchema.describe(
+      'Identifiers of folders to copy with their active descendants and files.'
+    ),
+  })
+  .refine((source) => source.fileIds.length + source.folderIds.length > 0, {
+    message: 'Select at least one file or folder to copy',
+  })
+export type FileCopySource = z.output<typeof fileCopySourceSchema>
+
+export const fileCopyDestinationSchema = z.strictObject({
+  owner: copyOwnerSchema.describe('Owner in which to create the copied files and folders.'),
+  folderId: copyIdSchema
+    .nullable()
+    .default(null)
+    .describe('Existing destination folder identifier. Omit or use null for the owner root.'),
+})
+export type FileCopyDestination = z.output<typeof fileCopyDestinationSchema>
+
+export const fileCopyInputSchema = z.strictObject({
+  source: fileCopySourceSchema.describe('Selection to read under the source owner.'),
+  destination: fileCopyDestinationSchema.describe('Destination requiring file write access.'),
+})
+export type FileCopyInput = z.output<typeof fileCopyInputSchema>
diff --git a/apps/sim/lib/mothership/generated/tool-catalog-v1.ts b/apps/sim/lib/mothership/generated/tool-catalog-v1.ts
index 6a0cc58e12e..2ece49b3f3c 100644
--- a/apps/sim/lib/mothership/generated/tool-catalog-v1.ts
+++ b/apps/sim/lib/mothership/generated/tool-catalog-v1.ts
@@ -8,6 +8,7 @@ export interface ToolCatalogEntry {
   description?:
     | 'Create a workspace in the conversation’s organization under the current user’s workspace-creation policy. Returns its ID for subsequent explicitly workspace-scoped commands. Includes a starter workflow unless skipDefaultWorkflow is true.'
     | 'Discover and configure organization Search sources. list/get return accessible sources and indexing status; providers returns available integration approvals; approve changes a provider approval when authorized; setup returns the existing connection UI for the user to complete. Put the returned setupUrl in a clickable Markdown link at the end of the reply. Setup does not mean connected or indexed. Use search_workspace and read_document to retrieve source content.'
+    | 'List accessible Projects within this conversation, with visible environments and current capabilities. Follow nextCursor for more results; discovery does not grant file write access.'
     | 'List currently accessible workspaces with roles and explicit capability restrictions. Bulk results report copilotAllowed and deniedCapabilities; exact workspaceId returns the full capability map. Omitted restrictions never authorize an operation.'
     | 'Read and manage account, organization, and workspace settings. list finds sections; get returns current values, updateSchema and operation names; describe returns one operation’s exact input schema; update changes narrow preferences; execute performs a listed operation; open returns the existing user setup flow. When user setup is needed, put the returned setupUrl in a clickable Markdown link at the end of the reply. Workspace resources retain their CLI commands. Account is the acting user; organization is the conversation’s organization. Every operation checks current permissions and entitlements.'
     | 'Read and save the selected workspace’s single dashboard, validated YAML over live tables. Load the create-dashboard skill for the schema. get returns content and revision, or nulls when the workspace has no dashboard yet; set with no revision creates it. Replacing an existing dashboard requires expectedRevision from get, so a concurrent edit is never overwritten. Use open_resource with type dashboard to show the result.'
@@ -84,6 +85,7 @@ export interface ToolCatalogEntry {
     | 'knowledge'
     | 'list_deployment_versions'
     | 'list_integration_tools'
+    | 'list_user_projects'
     | 'list_workspace_mcp_servers'
     | 'list_workspaces'
     | 'load_deployment'
@@ -7922,6 +7924,21 @@ export const SearchSources: ToolCatalogEntry = {
   },
 }
 
+export const ListUserProjects: ToolCatalogEntry = {
+  id: 'list_user_projects',
+  description:
+    'List accessible Projects within this conversation, with visible environments and current capabilities. Follow nextCursor for more results; discovery does not grant file write access.',
+  route: 'sim',
+  parameters: {
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    type: 'object',
+    properties: {
+      cursor: { type: 'string', minLength: 1 },
+      limit: { default: 50, type: 'integer', minimum: 1, maximum: 100 },
+    },
+  },
+}
+
 export const FfmpegOperation = {
   overlayAudio: 'overlay_audio',
   mixAudio: 'mix_audio',
@@ -8495,4 +8512,5 @@ export const TOOL_CATALOG: Record<string, ToolCatalogEntry> = {
   [Workspaces.id]: Workspaces,
   [Settings.id]: Settings,
   [SearchSources.id]: SearchSources,
+  [ListUserProjects.id]: ListUserProjects,
 }
diff --git a/apps/sim/lib/mothership/generated/tool-schemas-v1.ts b/apps/sim/lib/mothership/generated/tool-schemas-v1.ts
index 369aee5b4cf..7b184bd3fd3 100644
--- a/apps/sim/lib/mothership/generated/tool-schemas-v1.ts
+++ b/apps/sim/lib/mothership/generated/tool-schemas-v1.ts
@@ -8094,4 +8094,23 @@ export const TOOL_RUNTIME_SCHEMAS: Record<string, ToolRuntimeSchemaEntry> = {
     },
     resultSchema: undefined,
   },
+  list_user_projects: {
+    parameters: {
+      $schema: 'http://json-schema.org/draft-07/schema#',
+      type: 'object',
+      properties: {
+        cursor: {
+          type: 'string',
+          minLength: 1,
+        },
+        limit: {
+          default: 50,
+          type: 'integer',
+          minimum: 1,
+          maximum: 100,
+        },
+      },
+    },
+    resultSchema: undefined,
+  },
 }
diff --git a/apps/sim/lib/mothership/request/application/recover-stream.ts b/apps/sim/lib/mothership/request/application/recover-stream.ts
index a13c63715fe..f9b9739320c 100644
--- a/apps/sim/lib/mothership/request/application/recover-stream.ts
+++ b/apps/sim/lib/mothership/request/application/recover-stream.ts
@@ -11,6 +11,7 @@ import { defineOrganizationOperation } from '@/lib/core/application/organization
 import { isHosted } from '@/lib/core/config/env-flags'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { getLatestRunForStream } from '@/lib/mothership/async-runs/repository'
+import { createCopilotResourceAdmission } 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 { buildOnComplete, buildOnError } from '@/lib/mothership/chat/completion'
@@ -191,6 +192,10 @@ export const readChatStream = defineAuthorizedChatUseCase({
           executionId: run.executionId,
           workflowId: run.workflowId ?? undefined,
           goRoute: config.data.goRoute,
+          copilotResourceAdmission:
+            config.data.resourceAuthoringVersion === 1
+              ? createCopilotResourceAdmission({ userId, invocation: { kind: 'chat', chatId } })
+              : undefined,
           billingAttribution,
           userPermission: userPermission ?? undefined,
           interactive: true,
diff --git a/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.integration.ts b/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.integration.ts
new file mode 100644
index 00000000000..181bc53115b
--- /dev/null
+++ b/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.integration.ts
@@ -0,0 +1,64 @@
+import { createServer } from 'node:http'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { supportsFileOwnerProtocol } from '@/lib/mothership/request/lifecycle/file-owner-protocol'
+
+const worker = createServer((request, response) => {
+  switch (request.url) {
+    case '/supported/healthz':
+    case '/nested/worker/healthz':
+      response.writeHead(200, { 'X-Mothership-File-Owner-Protocol': '1' }).end()
+      return
+    case '/future/healthz':
+      response.writeHead(200, { 'X-Mothership-File-Owner-Protocol': '2' }).end()
+      return
+    case '/malformed/healthz':
+      response.writeHead(200, { 'X-Mothership-File-Owner-Protocol': '01' }).end()
+      return
+    case '/unhealthy/healthz':
+      response.writeHead(503, { 'X-Mothership-File-Owner-Protocol': '1' }).end()
+      return
+    case '/redirect/healthz':
+      response.writeHead(302, { location: '/supported/healthz' }).end()
+      return
+    case '/broken/healthz':
+      request.socket.destroy()
+      return
+    case '/unresponsive/healthz':
+      return
+    default:
+      response.writeHead(200).end()
+  }
+})
+
+let endpoint: string
+
+beforeAll(async () => {
+  await new Promise<void>((resolve) => worker.listen(0, '127.0.0.1', resolve))
+  const address = worker.address()
+  if (!address || typeof address === 'string') throw new Error('Worker fixture failed to bind')
+  endpoint = `http://127.0.0.1:${address.port}`
+})
+
+afterAll(
+  () =>
+    new Promise<void>((resolve, reject) => {
+      worker.close((error) => (error ? reject(error) : resolve()))
+      worker.closeAllConnections()
+    })
+)
+
+describe('file-owner worker negotiation over HTTP', () => {
+  it.each([
+    ['supported', true],
+    ['nested/worker/', true],
+    ['old', false],
+    ['future', false],
+    ['malformed', false],
+    ['unhealthy', false],
+    ['redirect', false],
+    ['broken', false],
+    ['unresponsive', false],
+  ] as const)('accepts only the healthy, exact protocol at %s', async (path, supported) => {
+    expect(await supportsFileOwnerProtocol(`${endpoint}/${path}`)).toBe(supported)
+  })
+})
diff --git a/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.ts b/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.ts
new file mode 100644
index 00000000000..854bc489a8b
--- /dev/null
+++ b/apps/sim/lib/mothership/request/lifecycle/file-owner-protocol.ts
@@ -0,0 +1,14 @@
+/** Negotiates against the selected worker; redirects cannot establish another peer's support. */
+export async function supportsFileOwnerProtocol(baseURL: string): Promise<boolean> {
+  try {
+    // boundary-raw-fetch: the selected worker advertises its live file-owner protocol in health headers.
+    const response = await fetch(`${baseURL.replace(/\/$/, '')}/healthz`, {
+      method: 'GET',
+      redirect: 'error',
+      signal: AbortSignal.timeout(2_000),
+    })
+    return response.ok && response.headers.get('X-Mothership-File-Owner-Protocol') === '1'
+  } catch {
+    return false
+  }
+}
diff --git a/apps/sim/lib/mothership/request/lifecycle/recovery-config.ts b/apps/sim/lib/mothership/request/lifecycle/recovery-config.ts
index 00b3f20ff43..3127144bb4b 100644
--- a/apps/sim/lib/mothership/request/lifecycle/recovery-config.ts
+++ b/apps/sim/lib/mothership/request/lifecycle/recovery-config.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { hasCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
 import { COPILOT_REQUEST_MODES } from '@/lib/mothership/constants'
 import { ChatPayloadSchema } from '@/lib/mothership/generated/protocol'
 import type { CopilotLifecycleOptions } from '@/lib/mothership/request/lifecycle/run'
@@ -22,6 +23,7 @@ export const DurableChatRequestSchema = ChatPayloadSchema.safeExtend({
 export const StreamRecoveryConfigSchema = z
   .object({
     kind: z.literal('interactive_stream'),
+    resourceAuthoringVersion: z.literal(1).optional(),
     billingAdmission: BillingAdmissionSchema.optional(),
     request: DurableChatRequestSchema,
     goRoute: z.enum(['/api/mothership', '/api/copilot']),
@@ -53,5 +55,14 @@ export function streamRecoveryConfig(
     clientToolPickupExpected: options.clientToolPickupExpected ?? true,
     userTimezone: options.executionContext?.userTimezone,
     requestMode: options.executionContext?.requestMode,
+    resourceAuthoringVersion: hasCopilotResourceAdmission({
+      ...options,
+      ...options.executionContext,
+      copilotToolExecution: true,
+      copilotResourceAdmission:
+        options.executionContext?.copilotResourceAdmission ?? options.copilotResourceAdmission,
+    })
+      ? 1
+      : undefined,
   })
 }
diff --git a/apps/sim/lib/mothership/request/lifecycle/run.ts b/apps/sim/lib/mothership/request/lifecycle/run.ts
index 5d0eee4b19c..e2b93a73a5e 100644
--- a/apps/sim/lib/mothership/request/lifecycle/run.ts
+++ b/apps/sim/lib/mothership/request/lifecycle/run.ts
@@ -15,6 +15,7 @@ import {
 } from '@/lib/billing/core/billing-attribution'
 import { env } from '@/lib/core/config/env'
 import { isCopilotToolPermissionsEnabled, isHosted } from '@/lib/core/config/env-flags'
+import { withFileOwnerContext } from '@/lib/mothership/application/file-owner-context'
 import { SIM_TOOL_EXECUTION_LEASE_SECONDS } from '@/lib/mothership/async-runs/execution-lease'
 import type { AsyncCompletionSignal } from '@/lib/mothership/async-runs/lifecycle'
 import {
@@ -22,6 +23,7 @@ import {
   getChatViewDesktopLeaseRemainingMs,
   updateRunStatus,
 } from '@/lib/mothership/async-runs/repository'
+import type { CopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
 import {
   CLIENT_TOOL_RESULT_TIMEOUT_MS,
   TOOL_WATCHDOG_RESUME_GRACE_MS,
@@ -275,6 +277,7 @@ function resultContent(context: StreamingContext, options: CopilotLifecycleOptio
 }
 
 export interface CopilotLifecycleOptions extends OrchestratorOptions {
+  copilotResourceAdmission?: CopilotResourceAdmission
   /** Trusted entry point for Search metering; never read from model arguments. */
   searchSurface?: 'copilot' | 'slack'
   mcpBlockId?: string
@@ -490,6 +493,8 @@ export async function runCopilotLifecycle(
       throw new Error('Organization execution context does not match its authenticated scope')
     }
     execContext.messageId = payloadMsgId
+    if (lifecycleOptions.copilotResourceAdmission)
+      execContext.copilotResourceAdmission = lifecycleOptions.copilotResourceAdmission
     if (options.recovery?.userTimezone) execContext.userTimezone = options.recovery.userTimezone
     execContext.requestMode = requestMode
     execContext.searchSurface = lifecycleOptions.searchSurface ?? 'copilot'
@@ -1220,6 +1225,8 @@ async function runCheckpointLoop(
     payload = { ...payload, organizationId: lifecycleOrganizationId, chatId: execContext.chatId }
   }
 
+  payload = await withFileOwnerContext(payload, execContext, mothershipBaseURL, initialRoute)
+
   for (;;) {
     await options.assertControllerOwnership?.()
     context.streamComplete = false
diff --git a/apps/sim/lib/mothership/request/session/sse.ts b/apps/sim/lib/mothership/request/session/sse.ts
index 99b8b58fe12..a1a92dfcf0e 100644
--- a/apps/sim/lib/mothership/request/session/sse.ts
+++ b/apps/sim/lib/mothership/request/session/sse.ts
@@ -1,9 +1,17 @@
+import { isRecordLike } from '@sim/utils/object'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
+import { presentChatResourceForBrowser } from '@/lib/mothership/resources/presentation'
 
 const encoder = new TextEncoder()
 
 export function encodeSSEEnvelope(envelope: unknown): Uint8Array {
-  return encoder.encode(`data: ${JSON.stringify(envelope)}\n\n`)
+  let presented = envelope
+  if (isRecordLike(envelope) && envelope.type === 'resource' && isRecordLike(envelope.payload)) {
+    const resource = presentChatResourceForBrowser(envelope.payload.resource)
+    if (resource !== envelope.payload.resource)
+      presented = { ...envelope, payload: { ...envelope.payload, resource } }
+  }
+  return encoder.encode(`data: ${JSON.stringify(presented)}\n\n`)
 }
 
 export const SSE_RESPONSE_HEADERS = {
diff --git a/apps/sim/lib/mothership/request/tools/executor.ts b/apps/sim/lib/mothership/request/tools/executor.ts
index 16e681e397e..1241d9f2b18 100644
--- a/apps/sim/lib/mothership/request/tools/executor.ts
+++ b/apps/sim/lib/mothership/request/tools/executor.ts
@@ -14,6 +14,7 @@ import {
   markAsyncToolRunning,
   upsertAsyncToolCall,
 } from '@/lib/mothership/async-runs/repository'
+import { hasCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
 import { withToolServiceMeter } from '@/lib/mothership/billing/service-meter'
 import {
   CLIENT_TOOL_RESULT_TIMEOUT_MS,
@@ -382,6 +383,9 @@ async function executeToolWithWatchdog(
             chatId: toolContext.chatId,
             workspaceId: toolContext.workspaceId,
             organizationId: toolContext.organizationId,
+            resourceAdmitted:
+              toolContext.requestMode !== 'assistant' && hasCopilotResourceAdmission(toolContext),
+            mothershipBaseURL: toolContext.mothershipBaseURL,
           },
           signal,
           onEvent,
diff --git a/apps/sim/lib/mothership/request/tools/resolved-secret-result.ts b/apps/sim/lib/mothership/request/tools/resolved-secret-result.ts
index 22ebd083a8b..4a40c1f7c84 100644
--- a/apps/sim/lib/mothership/request/tools/resolved-secret-result.ts
+++ b/apps/sim/lib/mothership/request/tools/resolved-secret-result.ts
@@ -61,6 +61,7 @@ const RESERVED_DISCLOSURE_KEYS = new Set(['resultWithheld', 'withheldReason', 'e
 const UNKNOWN_INPUT_PROVENANCE_REASONS = new Set<ResolvedSecretIncompletenessReason>([
   'mounted-file-provenance-unavailable',
   'workspace-file-provenance-unknown',
+  'project-file-provenance-unavailable',
   'file-source-unidentified',
   'table-snapshot-unsafe-for-mount',
   'table-result-provenance-unavailable',
diff --git a/apps/sim/lib/mothership/request/tools/resources.test.ts b/apps/sim/lib/mothership/request/tools/resources.test.ts
index 659f9572895..414e3f516f4 100644
--- a/apps/sim/lib/mothership/request/tools/resources.test.ts
+++ b/apps/sim/lib/mothership/request/tools/resources.test.ts
@@ -99,7 +99,11 @@ describe('handleResourceSideEffects', () => {
     }
   )
   it.each([
-    { chat: 'organization', organizationId: 'org', expected: { workspaceId: 'workspace-a' } },
+    {
+      chat: 'organization',
+      organizationId: 'org',
+      expected: { owner: { entityType: 'workspace', entityId: 'workspace-a' } },
+    },
     { chat: 'workspace', organizationId: undefined, expected: {} },
   ])(
     'addresses extracted exports in a $chat chat like its open tabs',
diff --git a/apps/sim/lib/mothership/request/tools/resources.ts b/apps/sim/lib/mothership/request/tools/resources.ts
index c74853cfda4..4097b18dc35 100644
--- a/apps/sim/lib/mothership/request/tools/resources.ts
+++ b/apps/sim/lib/mothership/request/tools/resources.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
-import { toRecord } from '@sim/utils/object'
+import { omit, toRecord } from '@sim/utils/object'
 import {
   MothershipStreamV1EventType,
   MothershipStreamV1ResourceOp,
@@ -19,6 +19,11 @@ import {
 } from '@/lib/mothership/resources/persistence'
 import { searchResultFromToolResult } from '@/lib/mothership/resources/search-tool-result'
 import { changeStoredChatResources } from '@/lib/mothership/resources/store'
+import {
+  getChatResourceWorkspaceId,
+  hasValidChatResourceOwner,
+  normalizeChatResource,
+} from '@/lib/mothership/resources/types'
 
 const logger = createLogger('CopilotResourceEffects')
 
@@ -65,7 +70,13 @@ export async function handleResourceSideEffects(
 
       if (hasDeleteCapability(toolName)) {
         const deleted = extractDeletedResourcesFromToolResult(toolName, params, result.output).map(
-          (resource) => ({ ...resource, ...(workspaceId ? { workspaceId } : {}) })
+          (resource) => {
+            const resourceWorkspaceId = getChatResourceWorkspaceId(resource, workspaceId)
+            return normalizeChatResource({
+              ...omit(resource, ['workspaceId']),
+              ...(resourceWorkspaceId ? { workspaceId: resourceWorkspaceId } : {}),
+            })
+          }
         )
         const projectedDeleted = extractDeletedResourcesFromToolResult(
           toolName,
@@ -98,6 +109,7 @@ export async function handleResourceSideEffects(
                   type: resource.type,
                   id: resource.id,
                   ...(resource.workspaceId ? { workspaceId: resource.workspaceId } : {}),
+                  ...(resource.owner ? { owner: resource.owner } : {}),
                   title: projected?.title ?? '',
                 },
               },
@@ -121,14 +133,18 @@ export async function handleResourceSideEffects(
               : []
         const resources =
           projectedResources.length === rawResources.length
-            ? rawResources.map((resource, index) => ({
-                ...projectedResources[index],
-                type: resource.type,
-                id: resource.id,
-                ...((resource.workspaceId ?? workspaceId)
-                  ? { workspaceId: resource.workspaceId ?? workspaceId }
-                  : {}),
-              }))
+            ? rawResources
+                .map((resource, index) => {
+                  const resourceWorkspaceId = getChatResourceWorkspaceId(resource, workspaceId)
+                  return normalizeChatResource({
+                    ...omit(projectedResources[index], ['owner', 'workspaceId']),
+                    type: resource.type,
+                    id: resource.id,
+                    ...(resource.owner ? { owner: resource.owner } : {}),
+                    ...(resourceWorkspaceId ? { workspaceId: resourceWorkspaceId } : {}),
+                  })
+                })
+                .filter(hasValidChatResourceOwner)
             : []
 
         if (resources.length > 0) {
diff --git a/apps/sim/lib/mothership/resources/client-persistence-queue.ts b/apps/sim/lib/mothership/resources/client-persistence-queue.ts
index 3f8fe699421..42d806710e7 100644
--- a/apps/sim/lib/mothership/resources/client-persistence-queue.ts
+++ b/apps/sim/lib/mothership/resources/client-persistence-queue.ts
@@ -1,3 +1,4 @@
+import type { FileOwner } from '@/lib/mothership/generated/file-owner'
 import type { MothershipResource, MothershipResourceUpdate } from '@/lib/mothership/resources/types'
 import {
   getChatResourceKey,
@@ -56,7 +57,7 @@ export class ResourcePersistenceQueue {
     scopeId: string,
     base?: MothershipResource
   ): void {
-    const key = this.getKey(scopeId, update.type, update.id, update.workspaceId)
+    const key = this.getKey(scopeId, update.type, update.id, update.workspaceId, update.owner)
     const trackedLocally =
       this.desiredUpdates.has(key) || this.pendingKeys.has(key) || this.inFlight.has(key)
     if (base && !trackedLocally) this.persistedKeys.add(key)
@@ -91,9 +92,10 @@ export class ResourcePersistenceQueue {
     id: string,
     scopeId: string,
     assumePersisted = false,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: FileOwner
   ): RemovedResourcePersistence {
-    const key = this.getKey(scopeId, type, id, workspaceId)
+    const key = this.getKey(scopeId, type, id, workspaceId, owner)
     const trackedLocally =
       this.desiredUpdates.has(key) || this.pendingKeys.has(key) || this.inFlight.has(key)
     if (assumePersisted && !trackedLocally) this.persistedKeys.add(key)
@@ -142,9 +144,10 @@ export class ResourcePersistenceQueue {
     scopeId: string,
     type: MothershipResource['type'],
     id: string,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: FileOwner
   ): boolean {
-    return this.desiredUpdates.has(this.getKey(scopeId, type, id, workspaceId))
+    return this.desiredUpdates.has(this.getKey(scopeId, type, id, workspaceId, owner))
   }
 
   /** Projects writes still in flight over server history, including queued removals. */
@@ -157,7 +160,13 @@ export class ResourcePersistenceQueue {
     )
     const projected: MothershipResource[] = []
     for (const resource of resources) {
-      const key = this.getKey(scopeId, resource.type, resource.id, resource.workspaceId)
+      const key = this.getKey(
+        scopeId,
+        resource.type,
+        resource.id,
+        resource.workspaceId,
+        resource.owner
+      )
       if (this.pendingRemovals.has(key)) continue
       const update = remaining.get(key)
       projected.push(update ? mergeChatResource(resource, update) : resource)
@@ -316,8 +325,9 @@ export class ResourcePersistenceQueue {
     scopeId: string,
     type: MothershipResource['type'],
     id: string,
-    workspaceId?: string
+    workspaceId?: string,
+    owner?: FileOwner
   ): string {
-    return `${this.getScopePrefix(scopeId)}${getChatResourceKey({ type, id, workspaceId })}`
+    return `${this.getScopePrefix(scopeId)}${getChatResourceKey({ type, id, workspaceId, owner })}`
   }
 }
diff --git a/apps/sim/lib/mothership/resources/presentation.ts b/apps/sim/lib/mothership/resources/presentation.ts
new file mode 100644
index 00000000000..47debfa6e4b
--- /dev/null
+++ b/apps/sim/lib/mothership/resources/presentation.ts
@@ -0,0 +1,16 @@
+import { isRecordLike } from '@sim/utils/object'
+
+/** Derives the file address understood by cached browsers without changing canonical storage. */
+export function presentChatResourceForBrowser<T>(resource: T): T {
+  if (
+    !isRecordLike(resource) ||
+    (resource.type !== 'file' && resource.type !== 'filefolder') ||
+    !isRecordLike(resource.owner) ||
+    resource.owner.entityType !== 'workspace' ||
+    typeof resource.owner.entityId !== 'string' ||
+    !resource.owner.entityId.trim() ||
+    resource.workspaceId === resource.owner.entityId
+  )
+    return resource
+  return { ...resource, workspaceId: resource.owner.entityId }
+}
diff --git a/apps/sim/lib/mothership/resources/store.ts b/apps/sim/lib/mothership/resources/store.ts
index d04427d5486..2168e3181fc 100644
--- a/apps/sim/lib/mothership/resources/store.ts
+++ b/apps/sim/lib/mothership/resources/store.ts
@@ -4,6 +4,7 @@ import { and, eq, isNull, sql } from 'drizzle-orm'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import {
   getChatResourceKey,
+  hasValidChatResourceOwner,
   type MothershipResource,
   type MothershipResourceUpdate,
   mergeChatResource,
@@ -54,7 +55,10 @@ export async function serializeChatResourceWrite<T>(
 
 export type ChatResourceChange =
   | { kind: 'upsert'; resources: MothershipResourceUpdate[] }
-  | { kind: 'remove'; resources: Pick<MothershipResource, 'type' | 'id' | 'workspaceId'>[] }
+  | {
+      kind: 'remove'
+      resources: Pick<MothershipResource, 'type' | 'id' | 'workspaceId' | 'owner'>[]
+    }
   | { kind: 'reorder'; resources: MothershipResource[] }
   | { kind: 'clear-view'; tableId: string; viewId: string; workspaceId?: string }
 
@@ -64,6 +68,11 @@ export async function changeStoredChatResources(
   change: ChatResourceChange,
   effectId?: string
 ): Promise<MothershipResource[]> {
+  if (
+    change.kind !== 'clear-view' &&
+    change.resources.some((resource) => !hasValidChatResourceOwner(resource))
+  )
+    throw new OrchestrationError('validation', 'Resource owner conflicts with its address')
   return serializeChatResourceWrite(chatId, () =>
     db.transaction(async (tx) => {
       await setChatResourceTxTimeouts(tx)
@@ -99,12 +108,7 @@ export async function changeStoredChatResources(
         resources = existing.filter(
           (resource) =>
             !change.resources.some(
-              (removed) =>
-                removed.type === resource.type &&
-                removed.workspaceId === resource.workspaceId &&
-                (removed.id === resource.id ||
-                  removed.type === 'browser' ||
-                  removed.type === 'terminal')
+              (removed) => getChatResourceKey(removed) === getChatResourceKey(resource)
             )
         )
       } else {
diff --git a/apps/sim/lib/mothership/resources/types.test.ts b/apps/sim/lib/mothership/resources/types.test.ts
index 17547c19ba8..98ad83e9e5c 100644
--- a/apps/sim/lib/mothership/resources/types.test.ts
+++ b/apps/sim/lib/mothership/resources/types.test.ts
@@ -286,7 +286,7 @@ describe('organization resource identity', () => {
     })
     expect(getChatResourceSelectionId(a)).toBe(a.id)
     expect(mergeChatResource(a, { ...a, path: 'files/new.png' })).toMatchObject({
-      workspaceId: 'a',
+      owner: { entityType: 'workspace', entityId: 'a' },
       workspaceName: 'Design',
     })
   })
diff --git a/apps/sim/lib/mothership/resources/types.ts b/apps/sim/lib/mothership/resources/types.ts
index 6e4990a6d31..c97c80f14ff 100644
--- a/apps/sim/lib/mothership/resources/types.ts
+++ b/apps/sim/lib/mothership/resources/types.ts
@@ -1,3 +1,4 @@
+import type { FileOwner } from '@/lib/mothership/generated/file-owner'
 import type { SearchResource } from '@/lib/mothership/generated/resources'
 
 export const MothershipResourceType = {
@@ -21,10 +22,11 @@ export type MothershipResourceType =
   (typeof MothershipResourceType)[keyof typeof MothershipResourceType]
 
 export interface MothershipResource {
+  owner?: FileOwner
   type: MothershipResourceType
   id: string
   title: string
-  /** Canonical resource owner; independent of the conversation's owner. */
+  /** Non-file workspace scope, or the legacy workspace file address. */
   workspaceId?: string
   workspaceName?: string
   path?: string
@@ -57,6 +59,7 @@ export interface MothershipResourceUpdate extends MothershipResource {
  * than filled in.
  */
 export interface WorkspaceResourceRef {
+  owner?: FileOwner
   type: MothershipResourceType
   id?: string
   path?: string
@@ -64,21 +67,77 @@ export interface WorkspaceResourceRef {
   workspaceId?: string
 }
 
+/** Explicit file ownership never inherits the conversation's workspace. */
+export function getChatResourceWorkspaceId(
+  resource: Pick<MothershipResource, 'workspaceId' | 'owner'>,
+  fallbackWorkspaceId?: string
+): string | undefined {
+  if (!resource.owner) return resource.workspaceId ?? fallbackWorkspaceId
+  return resource.owner.entityType === 'workspace' ? resource.owner.entityId : undefined
+}
+
+/** File owner pairs must agree with any legacy address supplied alongside them. */
+export function hasValidChatResourceOwner(
+  resource: Pick<MothershipResource, 'type' | 'workspaceId' | 'owner'>
+): boolean {
+  if (!resource.owner)
+    return (
+      (resource.type !== 'file' && resource.type !== 'filefolder') ||
+      resource.workspaceId === undefined ||
+      hasAddressableId(resource.workspaceId)
+    )
+  if (
+    (resource.type !== 'file' && resource.type !== 'filefolder') ||
+    !hasAddressableId(resource.owner.entityId)
+  )
+    return false
+  if (resource.owner.entityType === 'workspace')
+    return resource.workspaceId === undefined || resource.workspaceId === resource.owner.entityId
+  return resource.owner.entityType === 'project' && resource.workspaceId === undefined
+}
+
+/** Normalizes known file addresses without inferring ownership for older unscoped panels. */
+export function normalizeChatResource(
+  resource: MothershipResourceUpdate
+): MothershipResourceUpdate {
+  if (
+    (resource.type !== 'file' && resource.type !== 'filefolder') ||
+    resource.workspaceId === undefined ||
+    !hasValidChatResourceOwner(resource)
+  )
+    return resource
+  const { workspaceId, ...rest } = resource
+  return {
+    ...rest,
+    owner: resource.owner ?? { entityType: 'workspace', entityId: workspaceId },
+  }
+}
+
 /** Scope is part of identity for aliases such as integration names and folder paths. */
 export function getChatResourceKey(
-  resource: Pick<MothershipResource, 'type' | 'id' | 'workspaceId'>
+  resource: Pick<MothershipResource, 'type' | 'id' | 'workspaceId' | 'owner'>
 ): string {
-  return resource.workspaceId
-    ? JSON.stringify([resource.workspaceId, resource.type, resource.id])
+  if (resource.owner && resource.owner.entityType !== 'workspace')
+    return JSON.stringify([
+      resource.owner.entityType,
+      resource.owner.entityId,
+      resource.type,
+      resource.id,
+    ])
+  const workspaceId = getChatResourceWorkspaceId(resource)
+  return workspaceId
+    ? JSON.stringify([workspaceId, resource.type, resource.id])
     : `${resource.type}:${resource.id}`
 }
 
 /** UUID resources keep their existing deep links; workspace aliases need their owner in the URL. */
 export function getChatResourceSelectionId(resource: MothershipResource): string {
+  if (resource.owner && resource.owner.entityType !== 'workspace')
+    return getChatResourceKey(resource)
   const canonicalId = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
     resource.id
   )
-  return resource.workspaceId && !canonicalId && !isEphemeralResource(resource)
+  return getChatResourceWorkspaceId(resource) && !canonicalId && !isEphemeralResource(resource)
     ? getChatResourceKey(resource)
     : resource.id
 }
@@ -192,14 +251,16 @@ function withoutDesktopSessionResources(
 
 /**
  * The canonical form of a chat's resource list: legacy desktop panel rows and
- * unaddressable resources dropped. Every path that reads or writes stored
+ * unaddressable resources dropped and known file addresses normalized. Every path that reads or writes stored
  * resources goes through this, which is what heals chats that already hold
  * one.
  */
 export function sanitizeChatResources(
   resources: readonly MothershipResource[]
 ): MothershipResource[] {
-  return withoutDesktopSessionResources(resources).filter(isAddressableResource)
+  return withoutDesktopSessionResources(resources)
+    .filter((resource) => isAddressableResource(resource) && hasValidChatResourceOwner(resource))
+    .map(normalizeChatResource)
 }
 
 /**
@@ -250,6 +311,7 @@ export const GENERIC_RESOURCE_TITLES = new Set<string>([
  * and its no-op check.
  */
 const MERGED_FIELDS = {
+  owner: true,
   title: true,
   workspaceId: true,
   workspaceName: true,
@@ -275,6 +337,8 @@ export function mergeChatResource(
   prev: MothershipResource | undefined,
   next: MothershipResourceUpdate
 ): MothershipResource {
+  prev = prev ? normalizeChatResource(prev) : undefined
+  next = normalizeChatResource(next)
   if (!prev) {
     // Copied, never aliased: the result lands in React state, the query cache
     // and the pending-write queue at once, and `next` is the caller's object.
@@ -284,6 +348,7 @@ export function mergeChatResource(
   const { viewId: _previousViewId, ...prevWithoutViewId } = prev
   const merged: MothershipResource = {
     ...(next.clearViewId === true ? prevWithoutViewId : prev),
+    ...(next.owner !== undefined ? { owner: next.owner } : {}),
     ...(next.workspaceId !== undefined ? { workspaceId: next.workspaceId } : {}),
     ...(next.workspaceName !== undefined ? { workspaceName: next.workspaceName } : {}),
     ...(next.path !== undefined ? { path: next.path } : {}),
diff --git a/apps/sim/lib/mothership/tool-executor/executor.ts b/apps/sim/lib/mothership/tool-executor/executor.ts
index a3c4028d538..d20dcf9d181 100644
--- a/apps/sim/lib/mothership/tool-executor/executor.ts
+++ b/apps/sim/lib/mothership/tool-executor/executor.ts
@@ -1,11 +1,13 @@
 import { createLogger } from '@sim/logger'
 import { type PermissionType, permissionSatisfies } from '@sim/platform-authz/workspace'
 import { toError } from '@sim/utils/errors'
+import { openResourceInputSchema } from '@/lib/api/contracts/mothership-resource-tools'
 import { withWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope'
 import { withResourceOutboundScope } from '@/lib/core/network/resource-scope.server'
 import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
 import { ASSISTANT_TOOLS } from '@/lib/mothership/assistant/tool-policy'
 import { prepareCopilotEnvironmentContext } from '@/lib/mothership/environment-context'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
 import { projectToolErrorMessageForCopilot } from '@/lib/mothership/request/tools/resolved-secret-result'
 import { recordSecretUsage } from '@/lib/secrets/usage/record'
 import { executeTool as executeAppTool } from '@/tools'
@@ -39,6 +41,22 @@ export async function executeTool(
   params: Record<string, unknown>,
   context: ToolExecutionContext
 ): Promise<ToolExecutionResult> {
+  if (toolId === 'open_resource') {
+    const parsed = openResourceInputSchema.safeParse(params)
+    if (
+      parsed.success &&
+      parsed.data.resources.every(
+        (resource) =>
+          resource.type === 'file' &&
+          resource.owner &&
+          getCopilotFileOwnerAdapter(resource.owner).resourceScope === 'owner'
+      )
+    ) {
+      if (context.targetWorkspaceId)
+        return { success: false, error: 'These file owners do not take a workspace target' }
+      return executeBoundTool(toolId, params, context)
+    }
+  }
   if (context.organizationId) {
     if (
       context.workspaceId ||
diff --git a/apps/sim/lib/mothership/tool-executor/types.ts b/apps/sim/lib/mothership/tool-executor/types.ts
index 256eadd3cae..2f7acc8eac2 100644
--- a/apps/sim/lib/mothership/tool-executor/types.ts
+++ b/apps/sim/lib/mothership/tool-executor/types.ts
@@ -1,5 +1,6 @@
 import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution'
 import type { WorkspaceSearchFilters } from '@/lib/knowledge/search/filters'
+import type { CopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
 import type { MothershipResourceUpdate } from '@/lib/mothership/resources/types'
 import type { SecretMountPolicy } from '@/lib/mothership/secret-mount-policy'
 import type { ExecutorDelegationOrigin } from '@/executor/types'
@@ -34,6 +35,8 @@ export interface ToolExecutionContext {
   boundWorkflowExecutionId?: string
   billingAttribution?: BillingAttributionSnapshot
   copilotToolExecution?: boolean
+  /** In-process authoring admission; never supplied by model arguments or checkpoint JSON. */
+  copilotResourceAdmission?: CopilotResourceAdmission
   /** Trusted lifecycle classification stamped by the server, never from model parameters. */
   copilotInteractionMode?: 'interactive' | 'headless'
   requestMode?: string
diff --git a/apps/sim/lib/mothership/tools/client/resource-display.ts b/apps/sim/lib/mothership/tools/client/resource-display.ts
index 4b04e09bd17..d30fa4e810b 100644
--- a/apps/sim/lib/mothership/tools/client/resource-display.ts
+++ b/apps/sim/lib/mothership/tools/client/resource-display.ts
@@ -17,9 +17,9 @@ import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
 import { mcpKeys } from '@/hooks/queries/utils/mcp-keys'
 import { tableKeys } from '@/hooks/queries/utils/table-keys'
 import { workflowKeys } from '@/hooks/queries/utils/workflow-keys'
+import { workspaceFilesKeys } from '@/hooks/queries/utils/workspace-file-query'
 import { workspaceKeys } from '@/hooks/queries/workspace'
 import { workspaceFileFolderKeys } from '@/hooks/queries/workspace-file-folders'
-import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
 
 export interface ToolResourceContext {
   workspaceId?: string
diff --git a/apps/sim/lib/mothership/tools/handlers/sim-cli.ts b/apps/sim/lib/mothership/tools/handlers/sim-cli.ts
index 54ad322e57b..238f9fe0032 100644
--- a/apps/sim/lib/mothership/tools/handlers/sim-cli.ts
+++ b/apps/sim/lib/mothership/tools/handlers/sim-cli.ts
@@ -40,6 +40,11 @@ export async function executeSimCli(
       signal: context.abortSignal,
       toolCallId: context.toolCallId,
       copilotToolExecution: context.copilotToolExecution,
+      copilotResourceAdmission: context.copilotResourceAdmission,
+      copilotInteractionMode: context.copilotInteractionMode,
+      executorDelegationOrigin: context.executorDelegationOrigin,
+      mcpBlockId: context.mcpBlockId,
+      boundWorkflowExecutionId: context.boundWorkflowExecutionId,
       requestMode: context.requestMode,
       searchSurface: context.searchSurface,
       assistantSearch: context.assistantSearch,
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..8539c122e98 100644
--- a/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts
+++ b/apps/sim/lib/mothership/tools/registry/server-tool-adapter.ts
@@ -29,6 +29,10 @@ export function createServerToolHandler(toolId: string): ToolHandler {
         executionId: context.executionId,
         toolCallId: context.toolCallId,
         copilotToolExecution: context.copilotToolExecution,
+        copilotResourceAdmission: context.copilotResourceAdmission,
+        mcpBlockId: context.mcpBlockId,
+        executorDelegationOrigin: context.executorDelegationOrigin,
+        boundWorkflowExecutionId: context.boundWorkflowExecutionId,
         requestMode: context.requestMode,
         searchSurface: context.searchSurface,
         assistantSearch: context.assistantSearch,
diff --git a/apps/sim/lib/mothership/tools/sandbox-file-copy.ts b/apps/sim/lib/mothership/tools/sandbox-file-copy.ts
new file mode 100644
index 00000000000..5bb0a0e790d
--- /dev/null
+++ b/apps/sim/lib/mothership/tools/sandbox-file-copy.ts
@@ -0,0 +1,93 @@
+import { createLogger } from '@sim/logger'
+import { generateId } from '@sim/utils/id'
+import { NextRequest } from 'next/server'
+import { v2CopyFileItemsContract } from '@/lib/api/contracts/v2/file-copy'
+import { V2_PARSE_DEFAULTS, v2InvalidBodyResponse } from '@/lib/api/server/routes/v2-json-route'
+import { parseRequest } from '@/lib/api/server/validation'
+import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { createFileCopyCliTransport } from '@/lib/mothership/agent-cli/file-copy-transport'
+import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import {
+  type readSandboxResourceScope,
+  recordSandboxResourceEffects,
+} from '@/lib/mothership/tools/sandbox-resources'
+
+const logger = createLogger('SandboxFileCopy')
+
+/** A live callback delegates the exact pair; the shared operation owns both authorization and durable provenance. */
+export async function proxySandboxFileCopyRequest(
+  request: Request,
+  token: string,
+  scope: NonNullable<Awaited<ReturnType<typeof readSandboxResourceScope>>>
+): Promise<Response> {
+  if (
+    scope.fileOwnerProtocolVersion !== 1 ||
+    request.headers.has('x-mothership-file-owner') ||
+    request.headers.has('x-mothership-workspace-id')
+  )
+    return Response.json(
+      { error: 'Paired file owner routing is unavailable or contradictory' },
+      { status: 403 }
+    )
+  if (request.method !== 'POST')
+    return Response.json({ error: 'Method not allowed' }, { status: 405 })
+  const parsed = await parseRequest(
+    v2CopyFileItemsContract,
+    new NextRequest(request.clone()),
+    {},
+    {
+      ...V2_PARSE_DEFAULTS,
+      invalidJsonResponse: () => v2InvalidBodyResponse(request),
+    }
+  )
+  if (!parsed.success) return parsed.response
+  const endpoint = getInternalApiBaseUrl()
+  const transport = createFileCopyCliTransport(
+    endpoint,
+    {
+      userId: scope.userId,
+      chatId: scope.chatId,
+      toolCallId: scope.toolCallId,
+      copilotToolExecution: true,
+      copilotResourceAdmission: createCopilotResourceAdmission({
+        userId: scope.userId,
+        invocation: { kind: 'chat', chatId: scope.chatId },
+      }),
+    },
+    parsed.data.body
+  )
+  const forwarded = new Request(`${endpoint.replace(/\/$/, '')}${v2CopyFileItemsContract.path}`, {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify(parsed.data.body),
+    signal: request.signal,
+  })
+  const effects: ResourceChange[] = []
+  let completed: Response | undefined
+  const dispatch: typeof fetch = async (input, init) => {
+    completed = await transport(input, init)
+    return completed
+  }
+  let response: Response
+  try {
+    response = await createResourceEffectTransport(endpoint, dispatch, effects)(forwarded)
+  } catch (error) {
+    if (!completed) throw error
+    response = completed
+    logger.warn('Copy callback effect projection failed after API completion', {
+      toolCallId: scope.toolCallId,
+    })
+  }
+  const requestId = generateId()
+  await recordSandboxResourceEffects(
+    token,
+    scope,
+    effects.map((effect, index) => ({
+      ...effect,
+      effectId: `${scope.runId}:${scope.toolCallId}:${requestId}:${index}`,
+    }))
+  )
+  return response
+}
diff --git a/apps/sim/lib/mothership/tools/sandbox-project-files.ts b/apps/sim/lib/mothership/tools/sandbox-project-files.ts
new file mode 100644
index 00000000000..f0cea11186d
--- /dev/null
+++ b/apps/sim/lib/mothership/tools/sandbox-project-files.ts
@@ -0,0 +1,179 @@
+import { createLogger } from '@sim/logger'
+import { generateId } from '@sim/utils/id'
+import { getRedisClient } from '@/lib/core/config/redis'
+import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
+import { createDurableSecretProvenanceRegistry } from '@/lib/execution/durable-secret-provenance'
+import { resolveProvider } from '@/lib/execution/remote-sandbox/provider'
+import {
+  readSessionSecretProvenance,
+  recordExistingSessionFileInput,
+} from '@/lib/execution/remote-sandbox/session-file-provenance'
+import type { AgentCliExecutionContext } from '@/lib/mothership/agent-cli'
+import { createProjectFileCliTransport } from '@/lib/mothership/agent-cli/project-file-transport'
+import { createProjectFileUploadTransport } from '@/lib/mothership/agent-cli/project-file-upload-transport'
+import { createProjectFileWriteTransport } from '@/lib/mothership/agent-cli/project-file-write-transport'
+import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import {
+  type readSandboxResourceScope,
+  recordSandboxResourceEffects,
+} from '@/lib/mothership/tools/sandbox-resources'
+import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+import { observeWorkspaceFileDelivery } from '@/lib/workspace-files/application/file-delivery-observer'
+import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
+
+const logger = createLogger('SandboxProjectFiles')
+
+/** Authenticated callback lease supplies identity; every selected Project operation reauthorizes it. */
+export async function proxySandboxProjectFileRequest(
+  request: Request,
+  token: string,
+  path: string,
+  search: string,
+  scope: NonNullable<Awaited<ReturnType<typeof readSandboxResourceScope>>>,
+  projectId: string
+): Promise<Response> {
+  const endpoint = getInternalApiBaseUrl()
+  const sessionKey = chatSandboxSessionKey(scope.chatId)
+  const context: AgentCliExecutionContext = {
+    userId: scope.userId,
+    chatId: scope.chatId,
+    toolCallId: scope.toolCallId,
+    copilotToolExecution: true,
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId: scope.userId,
+      invocation: { kind: 'chat', chatId: scope.chatId },
+    }),
+    signal: request.signal,
+  }
+  const history = async () => {
+    request.signal.throwIfAborted()
+    const provider = resolveProvider()
+    const machine = await provider.findSessionSandbox?.(sessionKey, {})
+    if (!machine) throw new Error('The active workbench is unavailable')
+    const provenance = await readSessionSecretProvenance(sessionKey, {
+      providerId: provider.id,
+      sandboxId: machine.sandboxId,
+    })
+    if (provenance.status !== 'exact') throw new Error('Workbench source provenance is unavailable')
+    return provenance
+  }
+  const resolveSecretTraceRegistry = async () =>
+    (await createDurableSecretProvenanceRegistry(await history(), {
+      userId: scope.userId,
+    })) ?? new ResolvedSecretTraceRegistry([], { userId: scope.userId })
+  const bindingKey = `mothership:sandbox-resources:${token}:project-uploads:${encodeURIComponent(projectId)}`
+  const redis = () => {
+    const client = getRedisClient()
+    if (!client) throw new Error('Workbench upload binding is unavailable')
+    return client
+  }
+  const transport = createProjectFileUploadTransport({
+    endpoint,
+    projectId,
+    context,
+    resolveSecretTraceRegistry,
+    uploadBinding: {
+      async record(uploadId) {
+        await redis().eval(
+          "redis.call('SADD', KEYS[1], ARGV[1]); redis.call('EXPIRE', KEYS[1], 600); return 1",
+          1,
+          bindingKey,
+          uploadId
+        )
+      },
+      async contains(uploadId) {
+        return (await redis().sismember(bindingKey, uploadId)) === 1
+      },
+    },
+    /** Direct uploads conservatively retain the physical machine's complete source history. */
+    async uploadProvenance() {
+      const provenance = await history()
+      request.signal.throwIfAborted()
+      return {
+        status: 'exact',
+        entries: provenance.entries.map((entry) => {
+          if (!entry.sourceUserId) throw new Error('Workbench source identity is unavailable')
+          return { ...entry, sourceUserId: entry.sourceUserId }
+        }),
+      }
+    },
+    fallback: createProjectFileWriteTransport({
+      endpoint,
+      projectId,
+      context,
+      resolveSecretTraceRegistry,
+      fallback: createProjectFileCliTransport(endpoint, context, { projectId }),
+    }),
+  })
+  const headers = new Headers(request.headers)
+  for (const name of [
+    'host',
+    'cookie',
+    'authorization',
+    'connection',
+    'transfer-encoding',
+    'x-api-key',
+    'x-mothership-workspace-id',
+    'x-mothership-file-owner',
+  ])
+    headers.delete(name)
+  const forwarded = new Request(`${endpoint.replace(/\/$/, '')}${path}${search}`, {
+    method: request.method,
+    headers,
+    signal: request.signal,
+    redirect: 'manual',
+    ...(request.method === 'GET' || request.method === 'HEAD'
+      ? {}
+      : { body: request.body, duplex: 'half' }),
+  })
+  let observed = false
+  const delivery: typeof fetch = (input, init) =>
+    observeWorkspaceFileDelivery(
+      async (provenance) => {
+        if (provenance?.status !== 'exact')
+          throw new Error('Project file provenance is unavailable')
+        await recordExistingSessionFileInput(sessionKey, provenance)
+        observed = true
+      },
+      () => transport(input, init)
+    )
+  const effects: ResourceChange[] = []
+  let completed: Response | undefined
+  const dispatch: typeof fetch = async (input, init) => {
+    completed = await delivery(input, init)
+    return completed
+  }
+  let response: Response
+  try {
+    response = await createResourceEffectTransport(endpoint, dispatch, effects)(forwarded)
+  } catch (error) {
+    if (!completed) throw error
+    response = completed
+    logger.warn('Project callback effect projection failed after API completion', {
+      toolCallId: scope.toolCallId,
+    })
+  }
+  if (response.ok && response.body && response.headers.has('Content-Disposition') && !observed) {
+    await response.body.cancel()
+    return Response.json(
+      { error: 'File read provenance is unavailable. Retry the read.' },
+      { status: 503 }
+    )
+  }
+  const requestId = generateId()
+  await recordSandboxResourceEffects(
+    token,
+    scope,
+    effects.map((effect, index) => ({
+      ...effect,
+      effectId: `${scope.runId}:${scope.toolCallId}:${requestId}:${index}`,
+    }))
+  )
+  return new Response(request.method === 'HEAD' ? null : response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: response.headers,
+  })
+}
diff --git a/apps/sim/lib/mothership/tools/sandbox-resource-transport.test.ts b/apps/sim/lib/mothership/tools/sandbox-resource-transport.test.ts
index 12781b3eb2b..b1098b589bd 100644
--- a/apps/sim/lib/mothership/tools/sandbox-resource-transport.test.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-resource-transport.test.ts
@@ -4,20 +4,23 @@ import {
 } from '@sim/testing/mocks/mothership-workspace-target.mock'
 import { urlsMockFns } from '@sim/testing/mocks/urls.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { isCopilotRequest } from '@/lib/api/server/routes/copilot-request'
+import { copilotRequestPrincipal, isCopilotRequest } from '@/lib/api/server/routes/copilot-request'
 import { assertWorkspaceInvocationScope } from '@/lib/core/application/workspace-invocation-scope'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { projectFileOperations } from '@/lib/projects/files/application/operations'
 
-const { readScope, recordEffects, fetcher, routeMatcher, recordInput, mint } = vi.hoisted(() => ({
+const { readScope, recordEffects, fetcher, routeMatcher, recordInput } = vi.hoisted(() => ({
   readScope: vi.fn(),
   recordEffects: vi.fn(async () => {}),
   fetcher: vi.fn(),
   routeMatcher: vi.fn(),
   recordInput: vi.fn(),
-  mint: vi.fn(),
 }))
 vi.mock('@/lib/mothership/application/workspace-target', () => mothershipWorkspaceTargetMock)
-vi.mock('@/lib/api/server/routes/in-process-transport', () => ({ matchV2Route: routeMatcher }))
+vi.mock('@/lib/api/server/routes/in-process-transport', () => ({
+  matchV2Route: routeMatcher,
+  dispatchInProcessV2Request: (request: Request) => fetcher(request),
+}))
 vi.mock('@/lib/mothership/tools/sandbox-resources', () => ({
   readSandboxResourceScope: readScope,
   recordSandboxResourceEffects: recordEffects,
@@ -50,7 +53,6 @@ function request(path: string, init?: RequestInit) {
 
 beforeEach(() => {
   readScope.mockResolvedValue(scope)
-  mint.mockResolvedValue('server-only-identity')
   target.mockResolvedValue({ workspaceId: scope.workspaceId })
   routeMatcher.mockReturnValue({
     params: { tableId: 'table' },
@@ -87,7 +89,6 @@ describe('private sandbox v2 resource transport', () => {
       token
     )
     expect(await response.json()).toEqual({ data: { inserted: 1 } })
-    expect(fetcher).toHaveBeenCalledTimes(1)
     expect(recordEffects).toHaveBeenCalledWith(token, scope, [
       {
         op: 'upsert',
@@ -105,7 +106,6 @@ describe('private sandbox v2 resource transport', () => {
     )
     expect(response.status).toBe(403)
     expect(await response.json()).toEqual({ error: 'Forbidden' })
-    expect(fetcher).toHaveBeenCalledTimes(1)
     expect(fetcher.mock.calls[0]?.[0].url).toBe(
       'http://internal-sim/api/v2/tables/table/rows?workspaceId=other'
     )
@@ -138,7 +138,6 @@ describe('private sandbox v2 resource transport', () => {
         )
       ).status
     ).toBe(403)
-    expect(mint).not.toHaveBeenCalled()
     expect(fetcher).not.toHaveBeenCalled()
     target.mockResolvedValueOnce({ workspaceId: 'target' })
     fetcher.mockImplementation(async (req: Request) => {
@@ -156,7 +155,6 @@ describe('private sandbox v2 resource transport', () => {
       ).status
     ).toBe(200)
     expect(target).toHaveBeenLastCalledWith(orgScope, 'target')
-    expect(mint).not.toHaveBeenCalled()
   })
 
   it('rejects stale scopes and non-v2 destinations before dispatch', async () => {
@@ -224,7 +222,6 @@ describe('private sandbox v2 resource transport', () => {
       token
     )
     expect(response.status).toBe(400)
-    expect(fetcher).toHaveBeenCalledTimes(1)
   })
 
   it('rejects unknown v2 routes and methods without dispatch or network fallback', async () => {
@@ -260,8 +257,11 @@ it('does not poison public scratch after authenticated static catalog discovery'
     load: async () => ({ GET: fetcher }),
   })
   fetcher.mockResolvedValue(Response.json({ data: { id: 'agent' } }))
-  await proxySandboxResourceRequest(request('/api/v2/tools/function_execute'), token)
-  expect(fetcher).toHaveBeenCalledOnce()
+  const response = await proxySandboxResourceRequest(
+    request('/api/v2/tools/function_execute'),
+    token
+  )
+  expect(await response.json()).toEqual({ data: { id: 'agent' } })
   expect(recordInput).not.toHaveBeenCalled()
 })
 
@@ -272,21 +272,66 @@ it('cannot deliver a successful unclassified file response when recording its un
   await expect(proxySandboxResourceRequest(request('/api/v2/files/file'), token)).rejects.toThrow(
     'storage unavailable'
   )
-  expect(fetcher).toHaveBeenCalledOnce()
 })
 
-vi.mock('@/lib/mothership/chat/delegation', () => ({ mintDelegationToken: mint }))
+it.each([
+  [
+    'contradictory workspace',
+    '/api/v2/projects/project/files',
+    1,
+    { 'x-mothership-workspace-id': 'workspace' },
+  ],
+  ['another Project path', '/api/v2/projects/other/files', 1, {}],
+  ['non-file path', '/api/v2/tables', 1, {}],
+  ['unnegotiated lease', '/api/v2/projects/project/files', undefined, {}],
+] as const)(
+  'refuses %s before a Project callback can dispatch',
+  async (_name, path, protocol, headers) => {
+    readScope.mockResolvedValue({ ...scope, fileOwnerProtocolVersion: protocol })
+    fetcher.mockResolvedValue(Response.json({ data: [] }))
+    const response = await proxySandboxResourceRequest(
+      request(path, {
+        headers: {
+          ...headers,
+          'x-mothership-file-owner': JSON.stringify({ entityType: 'project', entityId: 'project' }),
+        },
+      }),
+      token
+    )
+    expect(response.status).toBeGreaterThanOrEqual(400)
+    expect(fetcher).not.toHaveBeenCalled()
+  }
+)
 
-it('never resolves a real credential for an invalid callback scope', async () => {
-  readScope.mockResolvedValue(null)
-  expect((await proxySandboxResourceRequest(request('/api/v2/tools'), token)).status).toBe(403)
-  expect(mint).not.toHaveBeenCalled()
-  expect(fetcher).not.toHaveBeenCalled()
-})
-it('keeps the server identity out of callback response headers and body', async () => {
-  fetcher.mockResolvedValue(Response.json({ data: [] }))
-  const response = await proxySandboxResourceRequest(request('/api/v2/tools'), token)
-  expect(mint).not.toHaveBeenCalled()
-  expect(JSON.stringify([...response.headers])).not.toContain('server-only-identity')
-  expect(await response.text()).not.toContain('server-only-identity')
+it('reconstructs Project authority from the admitted lease without borrowing its workspace', async () => {
+  readScope.mockResolvedValue({ ...scope, fileOwnerProtocolVersion: 1 })
+  routeMatcher.mockReturnValue({
+    pattern: '/api/v2/projects/{projectId}/files',
+    params: { projectId: 'project' },
+    load: async () => ({ GET: fetcher }),
+  })
+  fetcher.mockImplementation(async (request: Request) => {
+    const principal = copilotRequestPrincipal(request, projectFileOperations.list, {
+      operation: projectFileOperations.list,
+      delegationAudience: 'sim:project-files',
+    })
+    expect(principal).toMatchObject({
+      kind: 'resource_delegated',
+      subjectUserId: scope.userId,
+      invocation: { kind: 'chat', chatId: scope.chatId },
+      scope: { kind: 'entity', entityType: 'project', entityId: 'project' },
+    })
+    expect(principal).not.toHaveProperty('workspaceId')
+    return Response.json({ data: [] })
+  })
+  const response = await proxySandboxResourceRequest(
+    request('/api/v2/projects/project/files', {
+      headers: {
+        'x-mothership-file-owner': JSON.stringify({ entityType: 'project', entityId: 'project' }),
+      },
+    }),
+    token
+  )
+  expect(response.status).toBe(200)
+  expect(target).not.toHaveBeenCalled()
 })
diff --git a/apps/sim/lib/mothership/tools/sandbox-resource-transport.ts b/apps/sim/lib/mothership/tools/sandbox-resource-transport.ts
index 2f5f23ec218..e1b5e717d0d 100644
--- a/apps/sim/lib/mothership/tools/sandbox-resource-transport.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-resource-transport.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { NextRequest } from 'next/server'
+import { v2CopyFileItemsContract } from '@/lib/api/contracts/v2/file-copy'
 import { v2DownloadFileContract, v2ReadFileTextContract } from '@/lib/api/contracts/v2/files'
 import { markCopilotRequest } from '@/lib/api/server/routes/copilot-request'
 import { matchV2Route } from '@/lib/api/server/routes/in-process-transport'
@@ -17,7 +18,10 @@ import { reportDurableSecretProvenanceUnrecorded } from '@/lib/execution/durable
 import { recordExistingSessionFileInput } from '@/lib/execution/remote-sandbox/session-file-provenance'
 import { createResourceEffectTransport } from '@/lib/mothership/agent-cli/resource-effects'
 import { resolveInvocationWorkspace } from '@/lib/mothership/application/workspace-target'
+import { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 import type { ResourceChange } from '@/lib/mothership/generated/resources'
+import { proxySandboxFileCopyRequest } from '@/lib/mothership/tools/sandbox-file-copy'
+import { proxySandboxProjectFileRequest } from '@/lib/mothership/tools/sandbox-project-files'
 import {
   readSandboxResourceScope,
   recordSandboxResourceEffects,
@@ -49,11 +53,36 @@ export async function proxySandboxResourceRequest(
   const scope = await readSandboxResourceScope(token, request.headers.get('x-api-key'))
   if (!scope)
     return Response.json({ error: 'Sandbox tool execution is no longer active' }, { status: 403 })
+  if (path === v2CopyFileItemsContract.path)
+    return proxySandboxFileCopyRequest(request, token, scope)
+  const ownerHeader = request.headers.get('x-mothership-file-owner')
+  let owner: FileOperationOwner | undefined
+  if (ownerHeader !== null) {
+    if (scope.fileOwnerProtocolVersion !== 1 || request.headers.has('x-mothership-workspace-id'))
+      return Response.json(
+        { error: 'File owner routing is unavailable or contradictory' },
+        { status: 403 }
+      )
+    try {
+      owner = FileOperationOwner.parse(JSON.parse(ownerHeader))
+    } catch {
+      return Response.json({ error: 'Invalid file owner' }, { status: 400 })
+    }
+    const ownerPath =
+      owner.entityType === 'project'
+        ? `/api/v2/projects/${encodeURIComponent(owner.entityId)}/files`
+        : '/api/v2/files'
+    if (path !== ownerPath && !path.startsWith(`${ownerPath}/`))
+      return Response.json({ error: 'File owner does not match the API path' }, { status: 400 })
+    if (owner.entityType === 'project') {
+      return proxySandboxProjectFileRequest(request, token, path, url.search, scope, owner.entityId)
+    }
+  }
   let targetWorkspaceId: string
   try {
     const target = await resolveInvocationWorkspace(
       scope,
-      request.headers.get('x-mothership-workspace-id') ?? undefined
+      owner?.entityId ?? request.headers.get('x-mothership-workspace-id') ?? undefined
     )
     targetWorkspaceId = target.workspaceId
   } catch (error) {
@@ -87,6 +116,7 @@ async function proxyAuthorizedSandboxRequest(
     'connection',
     'transfer-encoding',
     'x-mothership-workspace-id',
+    'x-mothership-file-owner',
   ])
     headers.delete(header)
   headers.delete('x-api-key')
diff --git a/apps/sim/lib/mothership/tools/sandbox-resources.test.ts b/apps/sim/lib/mothership/tools/sandbox-resources.test.ts
index 4186d665480..a7a2fae98de 100644
--- a/apps/sim/lib/mothership/tools/sandbox-resources.test.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-resources.test.ts
@@ -1,3 +1,5 @@
+import { setEnv } from '@sim/testing/mocks/env.mock'
+import { featureFlagsMock, featureFlagsMockFns } from '@sim/testing/mocks/feature-flags.mock'
 import {
   mothershipAsyncRunsMock,
   mothershipAsyncRunsMockFns,
@@ -6,6 +8,8 @@ import { redisConfigMockFns } from '@sim/testing/mocks/redis-config.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { StreamEvent } from '@/lib/mothership/request/types'
 
+vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
+
 const { values, lists, seen, persist, redis } = vi.hoisted(() => {
   const values = new Map<string, string>()
   const lists = new Map<string, string[]>()
@@ -298,3 +302,42 @@ describe('sandbox resource ownership and publication', () => {
     expect(persist).toHaveBeenCalledTimes(1)
   })
 })
+
+it.each([
+  [true, true, true, true, 1],
+  [false, true, true, true, undefined],
+  [true, false, true, true, undefined],
+  [true, true, false, true, undefined],
+  [true, true, true, false, undefined],
+] as const)(
+  'negotiates the callback protocol only with admission=%s projects=%s peer=%s files=%s',
+  async (admitted, enabled, supported, filesEnabled, expected) => {
+    setEnv({ PROJECT_FILES_ENABLED: filesEnabled })
+    featureFlagsMockFns.mockIsFeatureEnabled.mockResolvedValue(enabled)
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(
+        async () =>
+          new Response(null, {
+            headers: supported ? { 'X-Mothership-File-Owner-Protocol': '1' } : {},
+          })
+      )
+    )
+    await withSandboxResourceScope(
+      {
+        ...identity,
+        resourceAdmitted: admitted,
+        mothershipBaseURL: 'https://selected-worker.invalid',
+      },
+      new AbortController().signal,
+      undefined,
+      async () => {
+        const endpoint = await sandboxResourceEndpoint('https://sim.test', args, 'secret')
+        const token = endpoint.split('/').at(-1)
+        if (!token) throw new Error('Callback token missing')
+        const scope = await readSandboxResourceScope(token, 'secret')
+        expect(scope?.fileOwnerProtocolVersion).toBe(expected)
+      }
+    )
+  }
+)
diff --git a/apps/sim/lib/mothership/tools/sandbox-resources.ts b/apps/sim/lib/mothership/tools/sandbox-resources.ts
index b34107d594a..80365c91cea 100644
--- a/apps/sim/lib/mothership/tools/sandbox-resources.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-resources.ts
@@ -8,9 +8,11 @@ import { getRedisClient } from '@/lib/core/config/redis'
 import type { SimToolExecutionOwner } from '@/lib/mothership/async-runs/execution-lease'
 import { isActiveSandboxResourceOwner } from '@/lib/mothership/async-runs/repository'
 import { ResourcePayload } from '@/lib/mothership/generated/resources'
+import { supportsFileOwnerProtocol } from '@/lib/mothership/request/lifecycle/file-owner-protocol'
 import type { StreamEvent } from '@/lib/mothership/request/types'
 import { persistResourceEffect } from '@/lib/mothership/resources/persist-effect'
 import { chatSandboxSessionKey } from '@/lib/mothership/tools/sandbox-session-key'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
 
 const logger = createLogger('MothershipSandboxResources')
 const CONTEXT_TTL_SECONDS = 600
@@ -25,6 +27,7 @@ const scopeSchema = z
     workspaceId: z.string().optional(),
     organizationId: z.string().optional(),
     apiKeyHash: z.string(),
+    fileOwnerProtocolVersion: z.literal(1).optional(),
   })
   .refine(
     (scope) => Boolean(scope.workspaceId) !== Boolean(scope.organizationId),
@@ -37,9 +40,12 @@ interface ActiveSandboxResourceScope {
     chatId: string
     workspaceId?: string
     organizationId?: string
+    resourceAdmitted?: boolean
+    mothershipBaseURL?: string
   }
   signal: AbortSignal
   token?: string
+  fileOwnerProtocolVersion?: 1
 }
 
 const resourceScope = new AsyncLocalStorage<ActiveSandboxResourceScope>()
@@ -49,6 +55,11 @@ export function activeSandboxChatOwner() {
   return resourceScope.getStore()?.identity
 }
 
+/** Negotiated routing hint; callback authorization remains bound to the active lease. */
+export function activeSandboxFileOwnerProtocol() {
+  return resourceScope.getStore()?.fileOwnerProtocolVersion
+}
+
 const contextKey = (token: string) => `mothership:sandbox-resources:${token}:context`
 const inboxKey = (token: string) => `mothership:sandbox-resources:${token}:inbox`
 const seenKey = (token: string) => `mothership:sandbox-resources:${token}:seen`
@@ -78,7 +89,25 @@ export async function sandboxResourceEndpoint(
   )
     throw new Error('Sandbox resource scope does not match the active tool')
   const token = active.token ?? generateId()
-  const scope: SandboxResourceScope = { ...identity, apiKeyHash: sha256Hex(apiKey) }
+  const fileOwnerProtocolVersion =
+    identity.resourceAdmitted &&
+    identity.mothershipBaseURL &&
+    (await isProjectFileApiEnabled()) &&
+    (await supportsFileOwnerProtocol(identity.mothershipBaseURL))
+      ? 1
+      : undefined
+  const scope: SandboxResourceScope = {
+    toolCallId: identity.toolCallId,
+    runId: identity.runId,
+    userId: identity.userId,
+    ownerToken: identity.ownerToken,
+    chatId: identity.chatId,
+    workspaceId: identity.workspaceId,
+    organizationId: identity.organizationId,
+    apiKeyHash: sha256Hex(apiKey),
+    fileOwnerProtocolVersion,
+  }
+  active.fileOwnerProtocolVersion = fileOwnerProtocolVersion
   await redisClient().set(contextKey(token), JSON.stringify(scope), 'EX', CONTEXT_TTL_SECONDS)
   active.token = token
   if (active.signal.aborted) {
diff --git a/apps/sim/lib/mothership/tools/sandbox-session.test.ts b/apps/sim/lib/mothership/tools/sandbox-session.test.ts
index d85b08cf212..75f6d6eeff7 100644
--- a/apps/sim/lib/mothership/tools/sandbox-session.test.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-session.test.ts
@@ -126,7 +126,11 @@ describe('deployment-owned workbench tooling', () => {
   )
 })
 
-vi.mock('@/lib/mothership/tools/sandbox-resources', () => ({ sandboxResourceEndpoint: endpoint }))
+vi.mock('@/lib/mothership/tools/sandbox-resources', () => ({
+  sandboxResourceEndpoint: endpoint,
+  activeSandboxChatOwner: () => undefined,
+  activeSandboxFileOwnerProtocol: () => undefined,
+}))
 
 it('does not inject authentication when no active scoped callback can be established', async () => {
   connection.mockReturnValue({ mode: 'direct' })
diff --git a/apps/sim/lib/mothership/tools/sandbox-session.ts b/apps/sim/lib/mothership/tools/sandbox-session.ts
index c262958226f..1cbd26b006c 100644
--- a/apps/sim/lib/mothership/tools/sandbox-session.ts
+++ b/apps/sim/lib/mothership/tools/sandbox-session.ts
@@ -17,7 +17,11 @@ import { WorkbenchBootstrap } from '@/lib/mothership/generated/workbench'
 import { fetchGo } from '@/lib/mothership/request/go/fetch'
 import { mothershipRequestHeaders } from '@/lib/mothership/request/headers'
 import { getMothershipBaseURL } from '@/lib/mothership/server/agent-url'
-import { sandboxResourceEndpoint } from '@/lib/mothership/tools/sandbox-resources'
+import {
+  activeSandboxChatOwner,
+  activeSandboxFileOwnerProtocol,
+  sandboxResourceEndpoint,
+} from '@/lib/mothership/tools/sandbox-resources'
 import { getSimConnection } from '@/lib/mothership/transport/connection'
 import {
   containsResolvedSecret,
@@ -70,7 +74,8 @@ async function workbenchCli(
   )
   signal?.throwIfAborted()
   const runtime = await readFile(path, 'utf8')
-  const baseURL = await getMothershipBaseURL({ userId })
+  const baseURL =
+    activeSandboxChatOwner()?.mothershipBaseURL ?? (await getMothershipBaseURL({ userId }))
   const deadline = AbortSignal.timeout(15_000)
   const response = await fetchGo(`${baseURL}/api/workbench/bootstrap`, {
     headers: mothershipRequestHeaders(),
@@ -147,6 +152,7 @@ export async function buildMothershipSandboxSession(args: {
           ? { SIM_ORGANIZATION_ID: args.organizationId }
           : { SIM_WORKSPACE: args.workspaceId! }),
         SIM_ENDPOINT: scopedEndpoint,
+        ...(activeSandboxFileOwnerProtocol() === 1 ? { SIM_FILE_OWNER_PROTOCOL: '1' } : {}),
       }
     }
   } catch (error) {
diff --git a/apps/sim/lib/mothership/tools/server/base-tool.ts b/apps/sim/lib/mothership/tools/server/base-tool.ts
index 20256b1e8b4..f1731a056c0 100644
--- a/apps/sim/lib/mothership/tools/server/base-tool.ts
+++ b/apps/sim/lib/mothership/tools/server/base-tool.ts
@@ -1,6 +1,8 @@
 import type { z } from 'zod'
 import type { BillingAttributionSnapshot } from '@/lib/billing/core/billing-attribution'
 import type { WorkspaceSearchFilters } from '@/lib/knowledge/search/filters'
+import type { CopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import type { ExecutorDelegationOrigin } from '@/executor/types'
 import type { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 
 export interface ServerToolContext {
@@ -18,6 +20,11 @@ export interface ServerToolContext {
   toolCallId?: string
   /** True only for contexts built by the authenticated Copilot execution pipeline. */
   copilotToolExecution?: boolean
+  copilotInteractionMode?: 'interactive' | 'headless'
+  copilotResourceAdmission?: CopilotResourceAdmission
+  mcpBlockId?: string
+  executorDelegationOrigin?: ExecutorDelegationOrigin
+  boundWorkflowExecutionId?: string
   billingAttribution?: BillingAttributionSnapshot
   userPermission?: string
   chatId?: string
diff --git a/apps/sim/lib/mothership/tools/server/open-resource.ts b/apps/sim/lib/mothership/tools/server/open-resource.ts
index ad622bc329b..b1a3f97cc38 100644
--- a/apps/sim/lib/mothership/tools/server/open-resource.ts
+++ b/apps/sim/lib/mothership/tools/server/open-resource.ts
@@ -12,7 +12,6 @@ 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 { 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'
 import { executeCopilotTableUseCase } from '@/lib/mothership/application/execute-table-use-case'
 import { executeCopilotWorkflowUseCase } from '@/lib/mothership/application/execute-workflow-use-case'
@@ -20,6 +19,7 @@ import {
   COPILOT_APPLICATION_DELEGATION_TTL_MS,
   requireTrustedCopilotExecutionContext,
 } from '@/lib/mothership/auth/application-delegation'
+import { getCopilotFileOwnerAdapter } from '@/lib/mothership/file-owners'
 import {
   assertServerToolNotAborted,
   type BaseServerTool,
@@ -27,7 +27,6 @@ import {
 import { readTableDefinitionUseCase } from '@/lib/table/application/tables'
 import { readTableViewUseCase } from '@/lib/table/application/views'
 import { readWorkflowMetadata } from '@/lib/workflows/application/read-workflow'
-import { readWorkspaceFileMetadata } from '@/lib/workspace-files/application/read-workspace-file-metadata'
 
 const executeLogUseCase = createCopilotApplicationAdapter({
   domain: 'logs',
@@ -45,15 +44,55 @@ export const openResourceServerTool: BaseServerTool<OpenResourceInput, OpenResou
   inputSchema: openResourceInputSchema,
   outputSchema: openResourceOutputSchema,
   async execute(input, context) {
-    const trusted = requireTrustedCopilotExecutionContext(context)
     if (context?.requestMode !== 'agent' && context?.requestMode !== 'plan')
       throw new OrchestrationError('forbidden', 'Resource panels require agent mode')
+    if (
+      input.resources.some(
+        (resource) =>
+          resource.owner && getCopilotFileOwnerAdapter(resource.owner).resourceScope === 'owner'
+      )
+    ) {
+      if (
+        input.workspaceId ||
+        input.resources.some(
+          (resource) =>
+            resource.type !== 'file' ||
+            !resource.owner ||
+            getCopilotFileOwnerAdapter(resource.owner).resourceScope !== 'owner' ||
+            resource.viewId
+        )
+      )
+        throw new OrchestrationError(
+          'validation',
+          'Owner-scoped files cannot be mixed with workspace targets'
+        )
+      const resources: OpenResourceOutput['resources'] = []
+      for (const resource of input.resources) {
+        assertServerToolNotAborted(context)
+        if (!resource.owner) throw new OrchestrationError('validation', 'File owner required')
+        const file = await getCopilotFileOwnerAdapter(resource.owner).readMetadata(context, {
+          owner: resource.owner,
+          fileId: resource.id,
+        })
+        resources.push({ type: 'file', id: file.id, title: file.name, owner: file.owner })
+      }
+      assertServerToolNotAborted(context)
+      return { resources }
+    }
+    const trusted = requireTrustedCopilotExecutionContext(context)
     if (input.workspaceId && input.workspaceId !== trusted.workspaceId)
       throw new OrchestrationError('not_found', 'Workspace not found in this invocation')
     const workspaceId = trusted.workspaceId
     const resources: OpenResourceOutput['resources'] = []
     for (const resource of input.resources) {
       assertServerToolNotAborted(context)
+      if (
+        resource.owner &&
+        (resource.type !== 'file' ||
+          getCopilotFileOwnerAdapter(resource.owner).resourceScope !== 'workspace' ||
+          resource.owner.entityId !== workspaceId)
+      )
+        throw new OrchestrationError('not_found', 'File owner not found in this invocation')
       if (resource.viewId && resource.type !== 'table')
         throw new OrchestrationError('validation', 'Saved views apply only to tables')
       const base = { type: resource.type, id: resource.id }
@@ -97,13 +136,19 @@ export const openResourceServerTool: BaseServerTool<OpenResourceInput, OpenResou
           break
         }
         case 'file': {
-          const { file } = await executeCopilotFileUseCase(
-            context,
-            readWorkspaceFileMetadata,
-            { fileId: resource.id, assertedWorkspaceId: workspaceId },
-            { fileId: resource.id }
-          )
-          resources.push({ ...base, title: file.name })
+          const owner = resource.owner ?? {
+            entityType: 'workspace' as const,
+            entityId: workspaceId,
+          }
+          const file = await getCopilotFileOwnerAdapter(owner).readMetadata(context, {
+            owner,
+            fileId: resource.id,
+          })
+          resources.push({
+            ...base,
+            title: file.name,
+            ...(resource.owner ? { owner: file.owner } : {}),
+          })
           break
         }
         case 'knowledgebase': {
diff --git a/apps/sim/lib/mothership/tools/server/project-list.ts b/apps/sim/lib/mothership/tools/server/project-list.ts
new file mode 100644
index 00000000000..6801139f96e
--- /dev/null
+++ b/apps/sim/lib/mothership/tools/server/project-list.ts
@@ -0,0 +1,50 @@
+import {
+  type ListUserProjectsInput,
+  listUserProjectsInputSchema,
+} from '@/lib/api/contracts/mothership-assistant-tools'
+import { asOrchestrationError } from '@/lib/core/orchestration/types'
+import { messageForCopilotApplicationError } from '@/lib/mothership/application/error'
+import { executeCopilotProjectFileUseCase } from '@/lib/mothership/application/execute-project-file-use-case'
+import { executeCopilotProjectDiscovery } from '@/lib/mothership/application/execute-project-use-case'
+import type { BaseServerTool } from '@/lib/mothership/tools/server/base-tool'
+import { listProjects } from '@/lib/projects/application'
+import { getProjectFileCapabilities } from '@/lib/projects/files/application'
+import { isProjectFileApiEnabled } from '@/lib/projects/rollout.server'
+
+export const listProjectsServerTool: BaseServerTool<ListUserProjectsInput> = {
+  name: 'list_user_projects',
+  inputSchema: listUserProjectsInputSchema,
+  async execute(raw, context) {
+    try {
+      const result = await executeCopilotProjectDiscovery(
+        context,
+        listProjects,
+        listUserProjectsInputSchema.parse(raw)
+      )
+      if (!(await isProjectFileApiEnabled())) return { success: true, ...result }
+      const fileOwnerCapabilities = []
+      for (const project of result.projects) {
+        try {
+          const target = { projectId: project.id }
+          fileOwnerCapabilities.push(
+            await executeCopilotProjectFileUseCase(
+              context,
+              getProjectFileCapabilities,
+              target,
+              target
+            )
+          )
+        } catch (error) {
+          const code = asOrchestrationError(error)?.code
+          if (code !== 'forbidden' && code !== 'not_found' && code !== 'conflict') throw error
+        }
+      }
+      return { success: true, ...result, fileOwnerCapabilities }
+    } catch (error) {
+      return {
+        success: false,
+        message: messageForCopilotApplicationError(error, 'Project discovery failed'),
+      }
+    }
+  },
+}
diff --git a/apps/sim/lib/mothership/tools/server/router.ts b/apps/sim/lib/mothership/tools/server/router.ts
index 698cf5d6e73..6a4cbbb8665 100644
--- a/apps/sim/lib/mothership/tools/server/router.ts
+++ b/apps/sim/lib/mothership/tools/server/router.ts
@@ -29,6 +29,7 @@ import { ffmpegServerTool } from '@/lib/mothership/tools/server/media/ffmpeg'
 import { generateAudioServerTool } from '@/lib/mothership/tools/server/media/generate-audio'
 import { generateVideoServerTool } from '@/lib/mothership/tools/server/media/generate-video'
 import { openResourceServerTool } from '@/lib/mothership/tools/server/open-resource'
+import { listProjectsServerTool } from '@/lib/mothership/tools/server/project-list'
 import { organizationSearchSourcesServerTool } from '@/lib/mothership/tools/server/search-sources'
 import { settingsServerTool } from '@/lib/mothership/tools/server/settings'
 import { getCredentialsServerTool } from '@/lib/mothership/tools/server/user/get-credentials'
@@ -65,6 +66,7 @@ const baseServerToolRegistry: Record<string, BaseServerTool> = {
   [searchDocsServerTool.name]: searchDocsServerTool,
   [searchWorkspaceServerTool.name]: searchWorkspaceServerTool,
   [listWorkspacesServerTool.name]: listWorkspacesServerTool,
+  [listProjectsServerTool.name]: listProjectsServerTool,
   [workspacesServerTool.name]: workspacesServerTool,
   [organizationSearchSourcesServerTool.name]: organizationSearchSourcesServerTool,
   [settingsServerTool.name]: settingsServerTool,
diff --git a/apps/sim/lib/mothership/tools/tool-activity.ts b/apps/sim/lib/mothership/tools/tool-activity.ts
index 6bd57b10ba1..d6b6869ea70 100644
--- a/apps/sim/lib/mothership/tools/tool-activity.ts
+++ b/apps/sim/lib/mothership/tools/tool-activity.ts
@@ -239,6 +239,7 @@ export const TOOL_ACTIVITIES: Readonly<Record<string, ActivityPhrase | Operation
   list_integrations: 'read integrations',
   list_workspace_mcp_servers: 'read MCP servers',
   list_workspaces: { verb: 'listed', object: 'workspaces' },
+  list_user_projects: { verb: 'listed', object: 'projects' },
   load_deployment: 'loaded workflow versions',
   load_integration_tool: 'loaded integration tools',
   load_skill: 'loaded skills',
diff --git a/apps/sim/lib/mothership/tools/tool-display.ts b/apps/sim/lib/mothership/tools/tool-display.ts
index f67921ef0c4..52f2f52ada0 100644
--- a/apps/sim/lib/mothership/tools/tool-display.ts
+++ b/apps/sim/lib/mothership/tools/tool-display.ts
@@ -630,6 +630,7 @@ const TOOL_TITLES: Record<string, string> = {
   list_file_folders: 'Listing folders',
   list_integration_tools: 'Listing integration tools',
   list_user_workspaces: 'Listing workspaces',
+  list_user_projects: 'Listing projects',
   list_workspace_mcp_servers: 'Listing MCP servers',
   load_deployment: 'Loading deployment',
   save_upload: 'Saving upload',
diff --git a/apps/sim/lib/projects/__integration__/foundation.integration.ts b/apps/sim/lib/projects/__integration__/foundation.integration.ts
index 7cd20e2b0dc..3de5f55a1bb 100644
--- a/apps/sim/lib/projects/__integration__/foundation.integration.ts
+++ b/apps/sim/lib/projects/__integration__/foundation.integration.ts
@@ -36,6 +36,10 @@ import {
   removeUserFromOrganization,
   transferOrganizationOwnership,
 } from '@/lib/billing/organizations/membership'
+import { createCopilotResourceAdmission } from '@/lib/mothership/auth/application-delegation'
+import { AgentCliRawResult } from '@/lib/mothership/generated/agent-cli'
+import type { ToolExecutionContext } from '@/lib/mothership/tool-executor/types'
+import { executeSimCli } from '@/lib/mothership/tools/handlers/sim-cli'
 import { prepareProjectsForAccountDeletion } from '@/lib/projects/account-deletion'
 import {
   archiveProject,
@@ -1430,6 +1434,166 @@ describe('Project discovery delegation', () => {
   beforeEach(() => {
     vi.stubEnv('PROJECT_FILES_ENABLED', 'true')
   })
+  /** Cross-process CLI requests must retain admitted authoring identity and execution exclusions. */
+  const cliRequest = {
+    invocation: { kind: 'service', name: 'list_user_projects', input: { limit: 100 } },
+  }
+
+  check(
+    'explicit Project CLI ownership reaches the authorized file collection without workspace fallback',
+    async () => {
+      const state = await fixture(false)
+      const context: ToolExecutionContext = {
+        userId: state.ownerId,
+        workflowId: '',
+        workspaceId: state.ids[0],
+        toolCallId: generateId(),
+        copilotToolExecution: true,
+        requestMode: 'agent',
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: state.ownerId,
+          invocation: { kind: 'workspace', workspaceId: state.ids[0] },
+        }),
+      }
+      const request = {
+        fileOwner: { entityType: 'project', entityId: state.projectId },
+        invocation: {
+          kind: 'cli',
+          argv: ['projects', 'files', 'list', state.projectId, '--output', 'json'],
+        },
+      }
+      const result = await executeSimCli({ request }, context)
+      expect(result.success, result.error).toBe(true)
+      const output = AgentCliRawResult.parse(result.output)
+      expect(output.exitCode, output.stderr).toBe(0)
+      expect(JSON.parse(output.stdout)).toMatchObject({ data: [], nextCursor: null })
+      const workspaceAttempt = await executeSimCli(
+        {
+          request: {
+            ...request,
+            invocation: { kind: 'cli', argv: ['files', 'list', '--output', 'json'] },
+          },
+        },
+        context
+      )
+      expect(workspaceAttempt.success).toBe(false)
+      expect(AgentCliRawResult.parse(workspaceAttempt.output).exitCode).not.toBe(0)
+      const foreign = await fixture(false)
+      const mismatch = await executeSimCli(
+        {
+          request: {
+            ...request,
+            invocation: {
+              kind: 'cli',
+              argv: ['projects', 'files', 'list', foreign.projectId, '--output', 'json'],
+            },
+          },
+        },
+        context
+      )
+      expect(mismatch.success).toBe(false)
+      expect(AgentCliRawResult.parse(mismatch.output).exitCode).not.toBe(0)
+    }
+  )
+
+  check(
+    'CLI Project discovery carries admitted workspace identity to the real application boundary',
+    async () => {
+      const state = await fixture(false)
+      const context: ToolExecutionContext = {
+        userId: state.ownerId,
+        workflowId: '',
+        workspaceId: state.ids[0],
+        toolCallId: generateId(),
+        copilotToolExecution: true,
+        requestMode: 'agent',
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: state.ownerId,
+          invocation: { kind: 'workspace', workspaceId: state.ids[0] },
+        }),
+      }
+      const result = await executeSimCli({ request: cliRequest }, context)
+      expect(result.success, result.error).toBe(true)
+      const output = AgentCliRawResult.parse(result.output)
+      expect(JSON.parse(output.stdout)).toMatchObject({
+        success: true,
+        projects: [{ id: state.projectId }],
+      })
+      for (const patch of [
+        { copilotResourceAdmission: undefined },
+        { copilotResourceAdmission: structuredClone(context.copilotResourceAdmission) },
+        { userId: state.outsiderId },
+        { workspaceId: state.ids[1] },
+        { mcpBlockId: generateId() },
+        { boundWorkflowExecutionId: generateId() },
+        { executorDelegationOrigin: { workflowId: generateId(), subjectUserId: state.ownerId } },
+      ]) {
+        const rejected = await executeSimCli(
+          { request: cliRequest, copilotResourceAdmission: context.copilotResourceAdmission },
+          { ...context, ...patch }
+        )
+        expect(rejected.success).toBe(false)
+      }
+      expect(
+        (await executeSimCli({ request: { ...cliRequest, workspaceId: state.ids[1] } }, context))
+          .success
+      ).toBe(false)
+    }
+  )
+
+  check(
+    'CLI Project discovery without an environment binds the owned organization chat and rechecks revocation',
+    async () => {
+      const state = await fixture()
+      const other = await fixture()
+      const chatId = generateId()
+      await db.insert(copilotChats).values({
+        id: chatId,
+        userId: state.ownerId,
+        organizationId: state.organizationId,
+        type: 'mothership',
+        config: { conversationMode: 'agent' },
+      })
+      const context: ToolExecutionContext = {
+        userId: state.ownerId,
+        workflowId: '',
+        organizationId: state.organizationId ?? undefined,
+        chatOrganizationId: state.organizationId ?? undefined,
+        chatId,
+        toolCallId: generateId(),
+        copilotToolExecution: true,
+        requestMode: 'agent',
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: state.ownerId,
+          invocation: { kind: 'chat', chatId },
+        }),
+      }
+      const result = await executeSimCli({ request: cliRequest }, context)
+      expect(result.success, result.error).toBe(true)
+      expect(JSON.parse(AgentCliRawResult.parse(result.output).stdout)).toMatchObject({
+        success: true,
+        projects: [{ id: state.projectId }],
+      })
+      expect(
+        (
+          await executeSimCli(
+            { request: cliRequest },
+            {
+              ...context,
+              organizationId: other.organizationId ?? undefined,
+              chatOrganizationId: other.organizationId ?? undefined,
+            }
+          )
+        ).success
+      ).toBe(false)
+      await db
+        .update(copilotChats)
+        .set({ userId: state.outsiderId })
+        .where(eq(copilotChats.id, chatId))
+      expect((await executeSimCli({ request: cliRequest }, context)).success).toBe(false)
+    }
+  )
+
   check(
     'binds organization discovery to the current owned chat and rechecks membership',
     async () => {
diff --git a/apps/sim/lib/projects/application/index.ts b/apps/sim/lib/projects/application/index.ts
index 2f3d714ebde..b3c9cc90775 100644
--- a/apps/sim/lib/projects/application/index.ts
+++ b/apps/sim/lib/projects/application/index.ts
@@ -2,6 +2,7 @@ export { createProject } from '@/lib/projects/application/create-project'
 export { projectOperations } from '@/lib/projects/application/operations'
 export {
   archiveProject,
+  getCurrentWorkspaceProject,
   getProject,
   getProjectIssueAccess,
   getWorkspaceProject,
diff --git a/apps/sim/lib/projects/application/use-cases.ts b/apps/sim/lib/projects/application/use-cases.ts
index 14d5ee74efa..8b9dda6a613 100644
--- a/apps/sim/lib/projects/application/use-cases.ts
+++ b/apps/sim/lib/projects/application/use-cases.ts
@@ -79,7 +79,7 @@ export const getProjectIssueAccess: OperationUseCase<
 
 export const listProjects: OperationUseCase<
   typeof projectOperations.list,
-  { organizationId?: string; cursor?: string; limit: number },
+  { organizationId?: string; projectId?: string; cursor?: string; limit: number },
   { projects: ReturnType<typeof presentProject>[]; nextCursor: string | null }
 > = {
   operation: projectOperations.list,
@@ -114,6 +114,7 @@ export const listProjects: OperationUseCase<
           ON ${project.id} = ${projectWorkspace.projectId} AND ${project.archivedAt} IS NULL
         WHERE TRUE
           ${scope.organizationId !== undefined ? sql`AND ${project.organizationId} IS NOT DISTINCT FROM ${scope.organizationId}` : sql``}
+          ${input.projectId !== undefined ? sql`AND ${project.id} = ${input.projectId}` : sql``}
           ${input.cursor ? sql`AND ${projectWorkspace.projectId} > ${input.cursor}` : sql``}
         ORDER BY 1
         LIMIT ${input.limit + 1}
@@ -243,3 +244,38 @@ export const getWorkspaceProject: OperationUseCase<
     }, READ_SNAPSHOT)
   },
 }
+
+/** Discovers the canonical invocation workspace's parent without depending on discovery ordering. */
+export const getCurrentWorkspaceProject: OperationUseCase<
+  typeof projectOperations.list,
+  Record<string, never>,
+  { project: ReturnType<typeof presentProject> | null }
+> = {
+  operation: projectOperations.list,
+  async execute({ principal }) {
+    requireProjectPrincipal(principal, projectOperations.list)
+    await requireProjectApiEnabled()
+    if (principal.kind !== 'resource_delegated')
+      throw new OrchestrationError('forbidden', 'Current Project discovery requires an invocation')
+    const scope = await resolveCopilotProjectScope(principal)
+    const workspaceId = scope.workspaceId
+    if (!workspaceId) return { project: null }
+    return db.transaction(async (tx) => {
+      const [membership] = await tx
+        .select({ projectId: projectWorkspace.projectId })
+        .from(projectWorkspace)
+        .where(eq(projectWorkspace.workspaceId, workspaceId))
+        .limit(1)
+      if (!membership) return { project: null }
+      const [context] = await authorizeProjectsForRead(tx, principal, [membership.projectId])
+      if (
+        !context ||
+        context.record.archivedAt ||
+        context.record.organizationId !== scope.organizationId ||
+        !context.environments.some((environment) => environment.id === workspaceId)
+      )
+        throw new OrchestrationError('not_found', 'Project not found')
+      return { project: presentProject(context) }
+    }, READ_SNAPSHOT)
+  },
+}
diff --git a/apps/sim/lib/projects/files/__integration__/authorization.integration.ts b/apps/sim/lib/projects/files/__integration__/authorization.integration.ts
index be1f5491242..bd76e1079ee 100644
--- a/apps/sim/lib/projects/files/__integration__/authorization.integration.ts
+++ b/apps/sim/lib/projects/files/__integration__/authorization.integration.ts
@@ -1,4 +1,5 @@
 import { mkdir, writeFile } from 'node:fs/promises'
+import { createServer } from 'node:http'
 import { dirname, resolve } from 'node:path'
 import type {
   OAuthAccessTokenPrincipal,
@@ -34,9 +35,20 @@ import { sleep } from '@sim/utils/helpers'
 import { generateId } from '@sim/utils/id'
 import { and, eq, inArray, sql } from 'drizzle-orm'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  copilotRequestPrincipal,
+  markCopilotProjectFileRequest,
+} from '@/lib/api/server/routes/copilot-request'
 import type { DbTransaction } from '@/lib/db/types'
+import { createProjectFileCliTransport } from '@/lib/mothership/agent-cli/project-file-transport'
+import { executeCopilotProjectDiscovery } from '@/lib/mothership/application/execute-project-use-case'
+import { withFileOwnerContext } from '@/lib/mothership/application/file-owner-context'
+import {
+  type CopilotExecutionContext,
+  createCopilotResourceAdmission,
+} from '@/lib/mothership/auth/application-delegation'
 import { acquirePermissionGroupOrgLock } from '@/lib/permission-groups/locks'
-import { renameProject } from '@/lib/projects/application'
+import { listProjects, renameProject } from '@/lib/projects/application'
 import {
   createProjectFileFolder,
   getProjectFileMetadata,
@@ -959,6 +971,126 @@ describe('Project file authority at the database boundary', () => {
       ).rejects.toMatchObject({ code: 'forbidden' })
     }
   )
+  check(
+    'private v2 admission preserves the actor and rechecks live Project membership',
+    async () => {
+      const f = await fixture()
+      const chatId = generateId()
+      const fileId = generateId()
+      await db.insert(copilotChats).values({
+        id: chatId,
+        userId: f.readerId,
+        organizationId: f.organizationId,
+        workspaceId: null,
+        type: 'mothership',
+        config: { conversationMode: 'agent' },
+        title: 'Private Project files',
+      })
+      await db.insert(workspaceFiles).values({
+        id: fileId,
+        userId: f.ownerId,
+        projectId: f.projectId,
+        context: 'project',
+        key: `project/${f.projectId}/${fileId}`,
+        originalName: 'architecture.md',
+        contentType: 'text/markdown',
+        sizeBytes: 0,
+      })
+      const request = new Request(
+        `http://localhost/api/v2/projects/${f.projectId}/files/${fileId}/metadata`
+      )
+      markCopilotProjectFileRequest(
+        request,
+        {
+          userId: f.readerId,
+          organizationId: f.organizationId,
+          chatId,
+          toolCallId: generateId(),
+          copilotToolExecution: true,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.readerId,
+            invocation: { kind: 'chat', chatId },
+          }),
+        },
+        { projectId: f.projectId, fileId }
+      )
+      const principal = copilotRequestPrincipal(
+        request,
+        projectFileOperations.readMetadata,
+        getProjectFileMetadata
+      )
+      if (!principal) throw new Error('Private Project admission did not produce a principal')
+      const input = { projectId: f.projectId, fileId }
+      expect(await getProjectFileMetadata.execute({ principal, input })).toMatchObject({
+        file: { id: fileId, owner: { entityType: 'project', entityId: f.projectId } },
+        capabilities: { canRead: true, canWrite: false },
+      })
+      await expect(
+        getProjectFileMetadata.execute({ principal, input: { ...input, fileId: generateId() } })
+      ).rejects.toMatchObject({ code: 'forbidden' })
+      await db.delete(permissions).where(eq(permissions.userId, f.readerId))
+      await expect(getProjectFileMetadata.execute({ principal, input })).rejects.toMatchObject({
+        code: 'not_found',
+      })
+    }
+  )
+
+  check(
+    'Project-only v2 transport reaches the canonical route and cannot change owners',
+    async () => {
+      const f = await fixture()
+      const fileId = generateId()
+      await db.insert(workspaceFiles).values({
+        id: fileId,
+        userId: f.ownerId,
+        projectId: f.projectId,
+        context: 'project',
+        key: `project/${f.projectId}/${fileId}`,
+        originalName: 'transport.md',
+        contentType: 'text/markdown',
+        sizeBytes: 0,
+      })
+      const context: CopilotExecutionContext = {
+        userId: f.readerId,
+        workspaceId: f.workspaces[0],
+        toolCallId: generateId(),
+        copilotToolExecution: true,
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: f.readerId,
+          invocation: { kind: 'workspace', workspaceId: f.workspaces[0] },
+        }),
+      }
+      const endpoint = 'http://localhost:3000'
+      const filePath = `/api/v2/projects/${f.projectId}/files/${fileId}/metadata`
+      const transport = createProjectFileCliTransport(endpoint, context, {
+        projectId: f.projectId,
+        fileId,
+      })
+      const response = await transport(`${endpoint}${filePath}`)
+      expect(response.status).toBe(200)
+      expect(await response.json()).toMatchObject({
+        data: { id: fileId, owner: { entityType: 'project', entityId: f.projectId } },
+      })
+      for (const url of [
+        `http://other.invalid${filePath}`,
+        `${endpoint}/api/v2/projects/${generateId()}/files/${fileId}/metadata`,
+        `${endpoint}/api/v2/projects/${f.projectId}/files/${generateId()}/metadata`,
+        `${endpoint}/api/v2/projects/${f.projectId}/files/folders`,
+        `${endpoint}/api/v2/files/${fileId}/metadata?workspaceId=${f.workspaces[0]}`,
+      ]) {
+        expect((await transport(url)).status).toBe(400)
+      }
+      const projectTransport = createProjectFileCliTransport(endpoint, context, {
+        projectId: f.projectId,
+      })
+      expect(
+        (await projectTransport(`${endpoint}/api/v2/projects/${f.projectId}/files`)).status
+      ).toBe(200)
+      expect((await projectTransport(`${endpoint}${filePath}`)).status).toBe(200)
+      context.boundWorkflowExecutionId = 'workflow-run'
+      expect((await transport(`${endpoint}${filePath}`)).status).toBe(403)
+    }
+  )
 })
 
 describe('shared file identity and current actor authority', () => {
@@ -1416,6 +1548,66 @@ describe('Mothership origin navigation and independent Project authority', () =>
     return { workspaceId, projectId: binding.projectId }
   }
 
+  function context(f: Awaited<ReturnType<typeof fixture>>): CopilotExecutionContext {
+    return {
+      userId: f.readerId,
+      workspaceId: f.workspaces[0],
+      requestMode: 'agent',
+      toolCallId: generateId(),
+      copilotToolExecution: true,
+      copilotResourceAdmission: createCopilotResourceAdmission({
+        userId: f.readerId,
+        invocation: { kind: 'workspace', workspaceId: f.workspaces[0] },
+      }),
+    }
+  }
+
+  check('origin A discovers accessible B while current-parent hints remain A', async () => {
+    const f = await fixture()
+    const b = await target(f)
+    const execution = context(f)
+    const listed = await executeCopilotProjectDiscovery(execution, listProjects, { limit: 100 })
+    expect(listed.projects.map((row) => row.id).sort()).toEqual([f.projectId, b.projectId].sort())
+    const peer = createServer((_request, response) => {
+      response.setHeader('X-Mothership-File-Owner-Protocol', '1')
+      response.end()
+    })
+    await new Promise<void>((resolve) => peer.listen(0, '127.0.0.1', resolve))
+    try {
+      const address = peer.address()
+      if (!address || typeof address === 'string') throw new Error('Protocol peer unavailable')
+      for (const [workspaceId, projectId] of [
+        [f.workspaces[0], f.projectId],
+        [b.workspaceId, b.projectId],
+      ]) {
+        const current = {
+          ...execution,
+          workspaceId,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.readerId,
+            invocation: { kind: 'workspace', workspaceId },
+          }),
+        }
+        const hints = await withFileOwnerContext(
+          {},
+          current,
+          `http://127.0.0.1:${address.port}`,
+          '/api/mothership'
+        )
+        expect(hints.project).toMatchObject({ id: projectId })
+      }
+    } finally {
+      await new Promise<void>((resolve, reject) =>
+        peer.close((error) => (error ? reject(error) : resolve()))
+      )
+    }
+    await db
+      .delete(permissions)
+      .where(and(eq(permissions.userId, f.readerId), eq(permissions.entityId, b.workspaceId)))
+    const revoked = await executeCopilotProjectDiscovery(execution, listProjects, { limit: 100 })
+    expect(revoked.projects.map((row) => row.id)).toEqual([f.projectId])
+  })
+
   check(
     'origin A reads and writes B and authorizes A to B copy with independent live grants',
     async () => {
diff --git a/apps/sim/lib/projects/files/__integration__/content.integration.ts b/apps/sim/lib/projects/files/__integration__/content.integration.ts
index b32f5b23386..50a80cd3976 100644
--- a/apps/sim/lib/projects/files/__integration__/content.integration.ts
+++ b/apps/sim/lib/projects/files/__integration__/content.integration.ts
@@ -4,6 +4,9 @@ import { tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { db } from '@sim/db'
 import {
+  copilotAsyncToolCalls,
+  copilotChats,
+  copilotRuns,
   folder,
   idempotencyKey,
   member,
@@ -23,6 +26,7 @@ import {
   workspaceFileVersion,
 } from '@sim/db/schema'
 import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
+import { sha256Hex } from '@sim/security/hash'
 import { createSessionPrincipal } from '@sim/testing/factories/principal.factory'
 import { createDeferred } from '@sim/testing/helpers/deferred'
 import { emailMailerMock, emailMailerMockFns } from '@sim/testing/mocks/email-mailer.mock'
@@ -37,13 +41,24 @@ import JSZip from 'jszip'
 import { NextResponse } from 'next/server'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
 
+const { redisUrl } = await vi.hoisted(async () => {
+  const { readTestRedisUrl } = await import('@sim/db/testing/test-infrastructure')
+  const redisUrl = readTestRedisUrl()
+  if (redisUrl) process.env.REDIS_URL = redisUrl
+  return { redisUrl }
+})
+
 vi.mock('@/lib/uploads/core/setup.server', () => uploadsSetupMock)
 vi.mock('@/lib/messaging/email/mailer', () => emailMailerMock)
 
+import { v2CopyFileItemsContract } from '@/lib/api/contracts/v2/file-copy'
 import * as tracking from '@/lib/billing/storage/tracking'
+import { closeRedisConnection, getRedisClient } from '@/lib/core/config/redis'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { processOutboxEventById } from '@/lib/core/outbox/service'
 import * as sandboxTask from '@/lib/execution/sandbox/run-task'
+import { executeAgentCliRequest } from '@/lib/mothership/agent-cli'
+import { proxySandboxResourceRequest } from '@/lib/mothership/tools/sandbox-resource-transport'
 import { readProjectFileArtifact } from '@/lib/projects/files/application/artifacts'
 import {
   createProjectFile,
@@ -2897,6 +2912,598 @@ describe('Project rendered artifacts against PostgreSQL and private storage', ()
   )
 })
 
+check(
+  'Project discovery accepts its opaque pagination cursor through the tool boundary',
+  async () => {
+    const f = await fixture()
+    const { listProjectsServerTool } = await import('@/lib/mothership/tools/server/project-list')
+    const { createCopilotResourceAdmission } = await import(
+      '@/lib/mothership/auth/application-delegation'
+    )
+    const result = await listProjectsServerTool.execute(
+      { cursor: 'zz-legacy-project', limit: 1 },
+      {
+        userId: f.editorId,
+        workspaceId: f.workspaceId,
+        toolCallId: generateId(),
+        copilotToolExecution: true,
+        copilotResourceAdmission: createCopilotResourceAdmission({
+          userId: f.editorId,
+          invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+        }),
+      }
+    )
+    expect(result).toMatchObject({ success: true, projects: [], nextCursor: null })
+  }
+)
+
+describe.skipIf(!redisUrl)('authenticated workbench copy callback', () => {
+  check(
+    'organization callback copies both owners with current access, provenance and durable effects',
+    async () => {
+      const f = await fixture()
+      const foreign = await fixture()
+      const destinationWorkspaceId = generateId()
+      await insertWorkspaceFixture(db, {
+        id: destinationWorkspaceId,
+        ownerId: f.ownerId,
+        billedAccountUserId: f.ownerId,
+        organizationId: f.organizationId,
+        workspaceMode: 'organization',
+        name: 'Copy destination',
+      })
+      const [destinationBinding] = await db
+        .select()
+        .from(projectWorkspace)
+        .where(eq(projectWorkspace.workspaceId, destinationWorkspaceId))
+      if (!destinationBinding) throw new Error('Destination Project missing')
+      const destinationPermissionId = generateId()
+      await db.insert(permissions).values({
+        id: destinationPermissionId,
+        userId: f.editorId,
+        entityType: 'workspace',
+        entityId: destinationWorkspaceId,
+        permissionType: 'write',
+      })
+      const source = await createProjectFile.execute({
+        principal: f.principal,
+        input: createInput(f.projectId, 'callback copy bytes'),
+      })
+      const evidence = {
+        status: 'exact' as const,
+        entries: [
+          {
+            encryptedValue: 'synthetic-encrypted-evidence',
+            sourceUserId: f.editorId,
+            sourceWorkspaceId: f.workspaceId,
+          },
+        ],
+      }
+      const { replaceWorkspaceFileSecretProvenanceInTx } = await import(
+        '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
+      )
+      const [sourceRow] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.id, source.file.id))
+      await db.transaction((tx) =>
+        replaceWorkspaceFileSecretProvenanceInTx(
+          tx,
+          source.file.id,
+          sourceRow.contentUpdatedAt,
+          evidence
+        )
+      )
+      const [sourceProvenance] = await db
+        .select()
+        .from(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, source.file.id))
+      const chatId = generateId()
+      await db.insert(copilotChats).values({
+        id: chatId,
+        userId: f.editorId,
+        organizationId: f.organizationId,
+        type: 'mothership',
+        config: { conversationMode: 'agent' },
+      })
+      const token = generateId()
+      const apiKey = generateId()
+      const scope = {
+        toolCallId: generateId(),
+        runId: generateId(),
+        userId: f.editorId,
+        ownerToken: generateId(),
+        chatId,
+        organizationId: f.organizationId,
+        apiKeyHash: sha256Hex(apiKey),
+        fileOwnerProtocolVersion: 1 as const,
+      }
+      await db.insert(copilotRuns).values({
+        id: scope.runId,
+        executionId: generateId(),
+        streamId: generateId(),
+        chatId,
+        userId: f.editorId,
+        organizationId: f.organizationId,
+      })
+      await db.insert(copilotAsyncToolCalls).values({
+        runId: scope.runId,
+        toolCallId: scope.toolCallId,
+        toolName: 'run_code',
+        executionOwnerToken: scope.ownerToken,
+        executionStartedAt: new Date(),
+        executionLeaseExpiresAt: new Date(Date.now() + 120_000),
+      })
+      const redis = getRedisClient()
+      if (!redis) throw new Error('Expected callback Redis')
+      const prefix = `mothership:sandbox-resources:${token}`
+      await redis.set(`${prefix}:context`, JSON.stringify(scope), 'EX', 120)
+      const sourceOwner = { entityType: 'project' as const, entityId: f.projectId }
+      const destinationOwner = {
+        entityType: 'workspace' as const,
+        entityId: destinationWorkspaceId,
+      }
+      const body = {
+        source: { owner: sourceOwner, fileIds: [source.file.id], folderIds: [] },
+        destination: { owner: destinationOwner, folderId: null },
+      }
+      const callback = (
+        value: unknown = body,
+        headers: Record<string, string> = {},
+        method = 'POST'
+      ) =>
+        proxySandboxResourceRequest(
+          new Request(`http://localhost:3000/api/mothership/sandbox/${token}/api/v2/files/copy`, {
+            method,
+            headers: { 'content-type': 'application/json', 'x-api-key': apiKey, ...headers },
+            ...(method === 'POST' ? { body: JSON.stringify(value) } : {}),
+          }),
+          token
+        )
+      const destinationRows = () =>
+        db
+          .select()
+          .from(workspaceFiles)
+          .where(eq(workspaceFiles.workspaceId, destinationWorkspaceId))
+      try {
+        const controller = new AbortController()
+        controller.abort()
+        await expect(
+          proxySandboxResourceRequest(
+            new Request(`http://localhost:3000/api/mothership/sandbox/${token}/api/v2/files/copy`, {
+              method: 'POST',
+              headers: { 'content-type': 'application/json', 'x-api-key': apiKey },
+              body: JSON.stringify(body),
+              signal: controller.signal,
+            }),
+            token
+          )
+        ).rejects.toMatchObject({ name: 'AbortError' })
+        expect(await destinationRows()).toEqual([])
+        const response = await callback()
+        expect(response.status, await response.clone().text()).toBe(201)
+        const result = v2CopyFileItemsContract.response.schema.parse(await response.json()).data
+        const [copied] = await destinationRows()
+        expect(copied).toMatchObject({
+          id: result.files[0]?.id,
+          userId: f.editorId,
+          workspaceId: destinationWorkspaceId,
+          projectId: null,
+        })
+        expect(await readFile(join(localStorageRoot, copied.key), 'utf8')).toBe(
+          'callback copy bytes'
+        )
+        const [provenance] = await db
+          .select()
+          .from(workspaceFileSecretProvenance)
+          .where(eq(workspaceFileSecretProvenance.fileId, copied.id))
+        expect(provenance).toMatchObject({
+          status: sourceProvenance.status,
+          entries: sourceProvenance.entries,
+        })
+        const effects = (await redis.lrange(`${prefix}:inbox`, 0, -1)).map((entry) =>
+          JSON.parse(entry)
+        )
+        expect(effects).toContainEqual(
+          expect.objectContaining({
+            op: 'upsert',
+            resource: expect.objectContaining({ id: copied.id, owner: destinationOwner }),
+          })
+        )
+        const [chat] = await db.select().from(copilotChats).where(eq(copilotChats.id, chatId))
+        expect(JSON.stringify(chat)).toContain(copied.id)
+        const reverse = await callback({
+          source: { owner: destinationOwner, fileIds: [copied.id], folderIds: [] },
+          destination: {
+            owner: { entityType: 'project', entityId: destinationBinding.projectId },
+            folderId: null,
+          },
+        })
+        expect(reverse.status, await reverse.clone().text()).toBe(201)
+        for (const input of [
+          {
+            ...body,
+            destination: {
+              owner: { entityType: 'project', entityId: destinationBinding.projectId },
+              folderId: null,
+            },
+          },
+          {
+            source: { owner: destinationOwner, fileIds: [copied.id], folderIds: [] },
+            destination: {
+              owner: { entityType: 'workspace', entityId: f.workspaceId },
+              folderId: null,
+            },
+          },
+        ]) {
+          const copiedResponse = await callback(input)
+          expect(copiedResponse.status, await copiedResponse.clone().text()).toBe(201)
+        }
+        await db
+          .update(copilotChats)
+          .set({ organizationId: null, workspaceId: f.workspaceId })
+          .where(eq(copilotChats.id, chatId))
+        await db
+          .update(copilotRuns)
+          .set({ organizationId: null, workspaceId: f.workspaceId })
+          .where(eq(copilotRuns.id, scope.runId))
+        await redis.set(
+          `${prefix}:context`,
+          JSON.stringify({ ...scope, organizationId: undefined, workspaceId: f.workspaceId }),
+          'EX',
+          120
+        )
+        expect((await callback()).status).toBe(201)
+        await db
+          .update(copilotChats)
+          .set({ organizationId: f.organizationId, workspaceId: null })
+          .where(eq(copilotChats.id, chatId))
+        await db
+          .update(copilotRuns)
+          .set({ organizationId: f.organizationId, workspaceId: null })
+          .where(eq(copilotRuns.id, scope.runId))
+        await redis.set(`${prefix}:context`, JSON.stringify(scope), 'EX', 120)
+        vi.stubEnv('PROJECT_FILES_ENABLED', 'false')
+        expect((await callback()).status).toBe(503)
+        const deniedProjectRead = await proxySandboxResourceRequest(
+          new Request(
+            `http://localhost:3000/api/mothership/sandbox/${token}/api/v2/projects/${f.projectId}/files`,
+            {
+              headers: {
+                'x-api-key': apiKey,
+                'x-mothership-file-owner': JSON.stringify(sourceOwner),
+              },
+            }
+          ),
+          token
+        )
+        expect(deniedProjectRead.status).toBe(503)
+        vi.stubEnv('PROJECT_FILES_ENABLED', 'true')
+        expect((await callback()).status).toBe(201)
+        const baseline = await destinationRows()
+        for (const headers of [
+          { 'x-api-key': generateId() },
+          { 'x-mothership-workspace-id': f.workspaceId },
+          { 'x-mothership-file-owner': JSON.stringify(sourceOwner) },
+        ])
+          expect((await callback(body, headers)).status).toBe(403)
+        expect((await callback(body, {}, 'GET')).status).toBe(405)
+        expect((await callback({ ...body, workspaceId: f.workspaceId })).status).toBe(400)
+        await redis.set(
+          `${prefix}:context`,
+          JSON.stringify({ ...scope, fileOwnerProtocolVersion: undefined }),
+          'EX',
+          120
+        )
+        expect((await callback()).status).toBe(403)
+        await redis.set(`${prefix}:context`, JSON.stringify(scope), 'EX', 120)
+        for (const invalid of [
+          {
+            ...body,
+            source: {
+              ...body.source,
+              owner: { entityType: 'project', entityId: foreign.projectId },
+            },
+          },
+          {
+            ...body,
+            destination: {
+              ...body.destination,
+              owner: { entityType: 'workspace', entityId: foreign.workspaceId },
+            },
+          },
+          { ...body, source: { ...body.source, fileIds: [generateId()] } },
+          { ...body, destination: { ...body.destination, folderId: generateId() } },
+        ])
+          expect((await callback(invalid)).ok).toBe(false)
+        await db
+          .update(permissions)
+          .set({ permissionType: 'read' })
+          .where(eq(permissions.id, destinationPermissionId))
+        expect((await callback()).ok).toBe(false)
+        await db
+          .update(permissions)
+          .set({ permissionType: 'write' })
+          .where(eq(permissions.id, destinationPermissionId))
+        const [sourcePermission] = await db
+          .select()
+          .from(permissions)
+          .where(and(eq(permissions.userId, f.editorId), eq(permissions.entityId, f.workspaceId)))
+        await db.delete(permissions).where(eq(permissions.id, sourcePermission.id))
+        expect((await callback()).ok).toBe(false)
+        await db.insert(permissions).values(sourcePermission)
+        const download = storage.downloadFile
+        let revoked = false
+        const read = vi.spyOn(storage, 'downloadFile').mockImplementation(async (options) => {
+          const bytes = await download(options)
+          if (!revoked) {
+            revoked = true
+            await db
+              .update(permissions)
+              .set({ permissionType: 'read' })
+              .where(eq(permissions.id, destinationPermissionId))
+          }
+          return bytes
+        })
+        try {
+          expect((await callback()).ok).toBe(false)
+          expect(revoked).toBe(true)
+        } finally {
+          read.mockRestore()
+        }
+        await db
+          .update(permissions)
+          .set({ permissionType: 'write' })
+          .where(eq(permissions.id, destinationPermissionId))
+        await db
+          .update(copilotAsyncToolCalls)
+          .set({ executionRevokedAt: new Date() })
+          .where(eq(copilotAsyncToolCalls.toolCallId, scope.toolCallId))
+        expect((await callback()).status).toBe(403)
+        expect(await destinationRows()).toEqual(baseline)
+      } finally {
+        await redis.del(`${prefix}:context`, `${prefix}:inbox`, `${prefix}:seen`)
+        await db
+          .delete(workspaceFiles)
+          .where(eq(workspaceFiles.projectId, destinationBinding.projectId))
+        await deleteWorkspaceFixture(db, eq(workspace.id, destinationWorkspaceId))
+      }
+    }
+  )
+})
+
+describe('private compound copy transport', () => {
+  check(
+    'native paired copy dispatch returns the destination resource and persists the current actor bytes',
+    async () => {
+      const { createCopilotResourceAdmission } = await import(
+        '@/lib/mothership/auth/application-delegation'
+      )
+      const { uploadWorkspaceFile } = await import(
+        '@/lib/uploads/contexts/workspace/workspace-file-manager'
+      )
+      const f = await fixture()
+      const original = await uploadWorkspaceFile(
+        f.workspaceId,
+        f.ownerId,
+        Buffer.from('native paired copy bytes'),
+        'native-copy.txt',
+        'text/plain'
+      )
+      const destinationFolder = await createProjectFileFolder.execute({
+        principal: f.principal,
+        input: { projectId: f.projectId, name: 'Architecture' },
+      })
+      const target = {
+        source: {
+          owner: { entityType: 'workspace' as const, entityId: f.workspaceId },
+          fileIds: [original.id],
+          folderIds: [],
+        },
+        destination: {
+          owner: { entityType: 'project' as const, entityId: f.projectId },
+          folderId: destinationFolder.folder.id,
+        },
+      }
+      const result = await executeAgentCliRequest(
+        {
+          invocation: {
+            kind: 'file-copy',
+            ...target,
+            argv: [
+              'files',
+              'copy',
+              '--source',
+              JSON.stringify(target.source),
+              '--destination',
+              JSON.stringify(target.destination),
+            ],
+          },
+        },
+        {
+          userId: f.editorId,
+          workspaceId: f.workspaceId,
+          toolCallId: generateId(),
+          copilotToolExecution: true,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.editorId,
+            invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+          }),
+        }
+      )
+      expect(result, result.stderr).toMatchObject({ exitCode: 0 })
+      const [copied] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.projectId, f.projectId))
+      if (!copied) throw new Error('Native paired copy created no durable Project file')
+      expect(copied.id).not.toBe(original.id)
+      expect(copied.userId).toBe(f.editorId)
+      expect(copied.folderId).toBe(destinationFolder.folder.id)
+      expect(await storage.downloadFile({ key: copied.key, context: 'project' })).toEqual(
+        Buffer.from('native paired copy bytes')
+      )
+      expect(result.resources).toContainEqual({
+        op: 'upsert',
+        resource: {
+          type: 'file',
+          owner: target.destination.owner,
+          id: copied.id,
+          title: 'native-copy.txt',
+          path: `projects/${f.projectId}/files/Architecture/native-copy.txt`,
+        },
+      })
+    }
+  )
+
+  check(
+    'private copy transport retains the acting user through the real v2 route and stored bytes',
+    async () => {
+      const { createFileCopyCliTransport } = await import(
+        '@/lib/mothership/agent-cli/file-copy-transport'
+      )
+      const { createCopilotResourceAdmission } = await import(
+        '@/lib/mothership/auth/application-delegation'
+      )
+      const f = await fixture()
+      const original = await createProjectFile.execute({
+        principal: createSessionPrincipal({ userId: f.ownerId }),
+        input: createInput(f.projectId, 'private compound copy bytes'),
+      })
+      const input = {
+        source: {
+          owner: { entityType: 'project' as const, entityId: f.projectId },
+          fileIds: [original.file.id],
+          folderIds: [],
+        },
+        destination: {
+          owner: { entityType: 'workspace' as const, entityId: f.workspaceId },
+          folderId: null,
+        },
+      }
+      const transport = createFileCopyCliTransport(
+        'http://localhost:3000',
+        {
+          userId: f.editorId,
+          workspaceId: f.workspaceId,
+          toolCallId: generateId(),
+          copilotToolExecution: true,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.editorId,
+            invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+          }),
+        },
+        input
+      )
+      const before = await ledger(f.organizationId)
+      const response = await transport('http://localhost:3000/api/v2/files/copy', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(input),
+      })
+      expect(response.status).toBe(201)
+      const [copied] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.workspaceId, f.workspaceId))
+      if (!copied || copied.sizeBytes === null)
+        throw new Error('Private copy created no sized durable file')
+      expect(copied.userId).toBe(f.editorId)
+      expect(copied.id).not.toBe(original.file.id)
+      expect(await storage.downloadFile({ key: copied.key, context: 'workspace' })).toEqual(
+        Buffer.from('private compound copy bytes')
+      )
+      expect(await ledger(f.organizationId)).toBe(before + copied.sizeBytes)
+    }
+  )
+
+  check(
+    'private copy transport binds immutable selections and refuses changed owners, routes and revoked access',
+    async () => {
+      const { createFileCopyCliTransport } = await import(
+        '@/lib/mothership/agent-cli/file-copy-transport'
+      )
+      const { createCopilotResourceAdmission } = await import(
+        '@/lib/mothership/auth/application-delegation'
+      )
+      const f = await fixture()
+      const original = await createProjectFile.execute({
+        principal: f.principal,
+        input: createInput(f.projectId),
+      })
+      const input = {
+        source: {
+          owner: { entityType: 'project' as const, entityId: f.projectId },
+          fileIds: [original.file.id],
+          folderIds: [],
+        },
+        destination: {
+          owner: { entityType: 'workspace' as const, entityId: f.workspaceId },
+          folderId: null,
+        },
+      }
+      const expected = structuredClone(input)
+      const transport = createFileCopyCliTransport(
+        'http://localhost:3000',
+        {
+          userId: f.editorId,
+          workspaceId: f.workspaceId,
+          toolCallId: generateId(),
+          copilotToolExecution: true,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.editorId,
+            invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+          }),
+        },
+        input
+      )
+      input.source.fileIds.push(generateId())
+      for (const body of [
+        input,
+        { ...expected, destination: { ...expected.destination, folderId: generateId() } },
+        {
+          ...expected,
+          source: { ...expected.source, owner: { entityType: 'project', entityId: generateId() } },
+        },
+      ]) {
+        expect(
+          (
+            await transport('http://localhost:3000/api/v2/files/copy', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify(body),
+            })
+          ).status
+        ).toBe(403)
+      }
+      expect(
+        (await transport(`http://localhost:3000/api/v2/projects/${f.projectId}/files`)).status
+      ).toBe(400)
+      expect(
+        (
+          await transport('http://other.invalid/api/v2/files/copy', {
+            method: 'POST',
+            body: JSON.stringify(expected),
+          })
+        ).status
+      ).toBe(400)
+      await db.delete(permissions).where(eq(permissions.userId, f.editorId))
+      expect(
+        (
+          await transport('http://localhost:3000/api/v2/files/copy', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(expected),
+          })
+        ).status
+      ).toBe(403)
+      expect(
+        await db.select().from(workspaceFiles).where(eq(workspaceFiles.workspaceId, f.workspaceId))
+      ).toEqual([])
+    }
+  )
+})
+
 describe('Project archive download and Markdown snapshot export', () => {
   check(
     'Project recursive download retains nested paths, deduplicates selections, and excludes archived or foreign items',
@@ -3223,7 +3830,28 @@ describe('Project archive download and Markdown snapshot export', () => {
         .from(workspaceFiles)
         .where(eq(workspaceFiles.id, source.file.id))
       expect(headAfter).toEqual(headBefore)
-
+      const { executeCopilotProjectFileUseCase } = await import(
+        '@/lib/mothership/application/execute-project-file-use-case'
+      )
+      const { createCopilotResourceAdmission } = await import(
+        '@/lib/mothership/auth/application-delegation'
+      )
+      const delegated = await executeCopilotProjectFileUseCase(
+        {
+          userId: f.editorId,
+          workspaceId: f.workspaceId,
+          toolCallId: generateId(),
+          copilotToolExecution: true,
+          copilotResourceAdmission: createCopilotResourceAdmission({
+            userId: f.editorId,
+            invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+          }),
+        },
+        exportProjectFileSnapshot,
+        { projectId: f.projectId, fileId: source.file.id, content: 'unclassified visible text' },
+        { projectId: f.projectId, fileId: source.file.id }
+      )
+      expect(delegated.secretProvenance.status).toBe('unknown')
       await updateProjectFileContent.execute({
         principal: f.principal,
         input: {
@@ -3242,6 +3870,29 @@ describe('Project archive download and Markdown snapshot export', () => {
     }
   )
 
+  check(
+    'Project Markdown snapshot export accepts parameterized alias MIME without a Markdown extension',
+    async () => {
+      const { exportProjectFileSnapshot } = await import(
+        '@/lib/projects/files/application/downloads'
+      )
+      const f = await fixture()
+      const source = await createProjectFile.execute({
+        principal: f.principal,
+        input: {
+          ...createInput(f.projectId, 'draft'),
+          name: 'notes.txt',
+          contentType: 'Text/X-Markdown; charset=utf-8',
+        },
+      })
+      const exported = await exportProjectFileSnapshot.execute({
+        principal: f.principal,
+        input: { projectId: f.projectId, fileId: source.file.id, content: '# Selected draft' },
+      })
+      expect(exported.buffer.toString('utf8')).toBe('# Selected draft')
+    }
+  )
+
   check(
     'Project Markdown snapshot export never collapses admitted control-bearing names into ZIP traversal segments',
     async () => {
@@ -3653,5 +4304,6 @@ afterAll(async () => {
     process.env.PROJECT_FILE_CONTENT_REPORT_PATH ?? 'test-results/project-file-content.json'
   await mkdir(dirname(report), { recursive: true })
   await writeFile(report, JSON.stringify({ checks }, null, 2))
+  await closeRedisConnection()
   await db.$client.end()
 })
diff --git a/apps/sim/lib/projects/files/__integration__/uploads.integration.ts b/apps/sim/lib/projects/files/__integration__/uploads.integration.ts
index f8ca99a85f6..0f6f01e676e 100644
--- a/apps/sim/lib/projects/files/__integration__/uploads.integration.ts
+++ b/apps/sim/lib/projects/files/__integration__/uploads.integration.ts
@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import { mkdtempSync } from 'node:fs'
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
@@ -27,21 +28,25 @@ import { generateId } from '@sim/utils/id'
 import { isRecordLike } from '@sim/utils/object'
 import { and, eq, inArray, sql } from 'drizzle-orm'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 
 vi.mock('@/lib/core/config/feature-flags', () => featureFlagsMock)
 
-await vi.hoisted(async () => {
+const { redisUrl } = await vi.hoisted(async () => {
   const { readTestRedisUrl } = await import('@sim/db/testing/test-infrastructure')
   const redisUrl = readTestRedisUrl()
   if (redisUrl) process.env.REDIS_URL = redisUrl
+  return { redisUrl }
 })
 
 vi.mock('@/lib/uploads/core/setup.server', () => uploadsSetupMock)
 
-import { closeRedisConnection } from '@/lib/core/config/redis'
+import { closeRedisConnection, getRedisClient } from '@/lib/core/config/redis'
+import { createWorkbenchFileProvenance } from '@/lib/mothership/agent-cli/workbench-file-provenance'
 import * as application from '@/lib/projects/files/application'
 import * as prefixCleanup from '@/lib/projects/files/prefix-cleanup'
 import * as manager from '@/lib/uploads/contexts/workspace/workspace-file-manager'
+import type { WorkspaceFileSecretProvenance } from '@/lib/uploads/contexts/workspace/workspace-file-secret-provenance'
 import {
   UPLOAD_URL_TTL_MS,
   writeLocalMultipartPart,
@@ -50,6 +55,7 @@ import {
 import * as sessions from '@/lib/uploads/upload-session/service'
 import { simPageSourceEmbedBlock } from '@/lib/workspace-files/page-source-embed'
 
+const redisKeys: string[] = []
 const storageRoot = mkdtempSync(join(tmpdir(), 'sim-project-upload-'))
 setUploadDirServer(storageRoot)
 const fixtures: {
@@ -635,6 +641,266 @@ describe('Project upload sessions with real leases, storage, and accounting', ()
   )
 })
 
+function workbench(f: Awaited<ReturnType<typeof fixture>>, bytes: Buffer) {
+  const machine = { providerId: 'daytona' as const, sandboxId: generateId() }
+  const sessionKey = generateId()
+  const namespace = createHash('sha256')
+    .update(
+      JSON.stringify([f.workspaceId, f.editorId, sessionKey, machine.providerId, machine.sandboxId])
+    )
+    .digest('hex')
+  const history = createHash('sha256')
+    .update(JSON.stringify([sessionKey, machine.providerId, machine.sandboxId]))
+    .digest('hex')
+  redisKeys.push(
+    `mothership:file-source:v1:${namespace}:${createHash('sha256').update(bytes).digest('hex')}`,
+    `mothership:workbench-provenance:v2:${history}`
+  )
+  return {
+    machine,
+    files: createWorkbenchFileProvenance({
+      workspaceId: f.workspaceId,
+      userId: f.editorId,
+      sessionKey,
+    }),
+  }
+}
+
+async function privateUploadTransport(
+  f: Awaited<ReturnType<typeof fixture>>,
+  uploadProvenance: () => WorkspaceFileSecretProvenance
+) {
+  const { createProjectFileUploadTransport } = await import(
+    '@/lib/mothership/agent-cli/project-file-upload-transport'
+  )
+  const { createProjectFileCliTransport } = await import(
+    '@/lib/mothership/agent-cli/project-file-transport'
+  )
+  const { createCopilotResourceAdmission } = await import(
+    '@/lib/mothership/auth/application-delegation'
+  )
+  const context = {
+    userId: f.editorId,
+    workspaceId: f.workspaceId,
+    toolCallId: generateId(),
+    copilotToolExecution: true,
+    copilotResourceAdmission: createCopilotResourceAdmission({
+      userId: f.editorId,
+      invocation: { kind: 'workspace', workspaceId: f.workspaceId },
+    }),
+  }
+  const endpoint = 'http://localhost:3000'
+  return createProjectFileUploadTransport({
+    endpoint,
+    projectId: f.projectId,
+    context: {
+      ...context,
+      resolvedSecretTraceRegistry: new ResolvedSecretTraceRegistry([], {
+        userId: f.editorId,
+        workspaceId: f.workspaceId,
+      }),
+    },
+    fallback: createProjectFileCliTransport(endpoint, context, { projectId: f.projectId }),
+    uploadProvenance,
+  })
+}
+
+async function createPrivateUpload(transport: typeof fetch, projectId: string, bytes: Buffer) {
+  const { v2CreateProjectFileUploadContract } = await import(
+    '@/lib/api/contracts/v2/project-file-uploads'
+  )
+  const response = await transport(
+    `http://localhost:3000/api/v2/projects/${projectId}/files/uploads`,
+    {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        name: 'private.bin',
+        contentType: 'application/octet-stream',
+        size: bytes.length,
+      }),
+    }
+  )
+  expect(response.status).toBe(201)
+  const created = v2CreateProjectFileUploadContract.response.schema.parse(
+    await response.json()
+  ).data
+  return { created, session: await sessions.verifyUploadSessionToken(created.uploadToken) }
+}
+
+function completePrivateUpload(
+  transport: typeof fetch,
+  projectId: string,
+  session: sessions.UploadSessionRecord
+) {
+  return transport(
+    `http://localhost:3000/api/v2/projects/${projectId}/files/uploads/${session.id}/complete`,
+    {
+      method: 'POST',
+      headers: { 'upload-token': session.uploadToken },
+    }
+  )
+}
+
+describe.skipIf(!redisUrl)('private Project upload transport', () => {
+  check(
+    'private Project upload seals actual streamed source evidence and retains original provenance attribution',
+    async () => {
+      const { v2CompleteProjectFileUploadContract } = await import(
+        '@/lib/api/contracts/v2/project-file-uploads'
+      )
+      const f = await fixture()
+      const bytes = Buffer.from([0, 255, 17, 6, 12])
+      const evidence = {
+        status: 'exact' as const,
+        entries: [
+          {
+            encryptedValue: 'upload-ciphertext-fixture',
+            sourceUserId: f.ownerId,
+            sourceWorkspaceId: f.workspaceId,
+          },
+        ],
+      }
+      const { machine, files } = workbench(f, bytes)
+      const transport = await privateUploadTransport(f, files.uploadProvenance)
+      const downloaded = stream(bytes)
+      files.trackDownload(downloaded, evidence)
+      await new Response(files.observeDownload(machine, downloaded)).arrayBuffer()
+      const { session } = await createPrivateUpload(transport, f.projectId, bytes)
+      expect(session.metadata.projectFileSecretProvenance).toMatchObject({
+        projectId: f.projectId,
+        pending: true,
+      })
+      await writeLocalPutObject({
+        uploadId: session.id,
+        key: session.finalKey,
+        body: files.observeUpload(machine, stream(bytes)),
+        expectedSize: bytes.length,
+        contentType: session.contentType,
+        metadata: sessions.uploadSessionObjectMetadata(session),
+      })
+      const response = await completePrivateUpload(transport, f.projectId, session)
+      expect(response.status).toBe(200)
+      const completed = v2CompleteProjectFileUploadContract.response.schema.parse(
+        await response.json()
+      ).data
+      if (!completed.file) throw new Error('Private upload did not produce a file')
+      const [file] = await db
+        .select()
+        .from(workspaceFiles)
+        .where(eq(workspaceFiles.id, completed.file.id))
+      const [provenance] = await db
+        .select()
+        .from(workspaceFileSecretProvenance)
+        .where(eq(workspaceFileSecretProvenance.fileId, file.id))
+      expect(file).toMatchObject({
+        projectId: f.projectId,
+        userId: f.editorId,
+        workspaceId: null,
+      })
+      expect(await readFile(join(storageRoot, file.key))).toEqual(bytes)
+      expect(provenance).toMatchObject(evidence)
+      expect(await usage(f.organizationId)).toBe(bytes.length)
+    }
+  )
+
+  check(
+    'private Project upload refuses incomplete evidence and never upgrades unknown or unrecorded streams to clean',
+    async () => {
+      const f = await fixture()
+      const bytes = Buffer.from('stream source')
+      for (const status of ['missing', 'partial', 'unknown', 'unrecorded'] as const) {
+        const { machine, files } = workbench(f, bytes)
+        const transport = await privateUploadTransport(f, files.uploadProvenance)
+        const { session } = await createPrivateUpload(transport, f.projectId, bytes)
+        if (status === 'missing' || status === 'partial') {
+          const partial =
+            status === 'partial'
+              ? files
+                  .observeUpload(
+                    machine,
+                    new ReadableStream<Uint8Array>({
+                      start(controller) {
+                        controller.enqueue(bytes)
+                      },
+                    })
+                  )
+                  .getReader()
+              : undefined
+          if (partial) await partial.read()
+          await put(session, bytes)
+          const response = await completePrivateUpload(transport, f.projectId, session)
+          expect(response.status).toBe(503)
+          if (partial) await partial.cancel()
+          const current = await sessions.verifyUploadSessionToken(session.uploadToken)
+          expect(current.completedFileId).toBeNull()
+          expect(current.metadata.projectFileSecretProvenance).toMatchObject({ pending: true })
+        } else {
+          const downloaded = stream(bytes)
+          files.trackDownload(downloaded, { status })
+          await new Response(files.observeDownload(machine, downloaded)).arrayBuffer()
+          await writeLocalPutObject({
+            uploadId: session.id,
+            key: session.finalKey,
+            body: files.observeUpload(machine, stream(bytes)),
+            expectedSize: bytes.length,
+            contentType: session.contentType,
+            metadata: sessions.uploadSessionObjectMetadata(session),
+          })
+          const response = await completePrivateUpload(transport, f.projectId, session)
+          expect(response.status).toBe(200)
+          const current = await sessions.verifyUploadSessionToken(session.uploadToken)
+          if (!current.completedFileId) throw new Error('Classified upload did not produce a file')
+          const [provenance] = await db
+            .select()
+            .from(workspaceFileSecretProvenance)
+            .where(eq(workspaceFileSecretProvenance.fileId, current.completedFileId))
+          expect(provenance).toMatchObject({ status, entries: [] })
+        }
+      }
+      expect(await usage(f.organizationId)).toBe(bytes.length * 2)
+    }
+  )
+
+  check(
+    'private Project upload binds control receipts to the invocation and current owner access',
+    async () => {
+      const f = await fixture()
+      const bytes = Buffer.from('private upload')
+      const evidence = () => ({ status: 'unknown' as const })
+      const transport = await privateUploadTransport(f, evidence)
+      const { session } = await createPrivateUpload(transport, f.projectId, bytes)
+      await put(session, bytes)
+      const foreignTransport = await privateUploadTransport(f, evidence)
+      expect((await completePrivateUpload(foreignTransport, f.projectId, session)).status).toBe(403)
+      expect((await completePrivateUpload(transport, generateId(), session)).status).toBe(400)
+      expect(
+        (
+          await transport(`http://localhost:3000/api/v2/projects/${f.projectId}/files/uploads`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              name: 'forged.bin',
+              contentType: 'application/octet-stream',
+              size: 1,
+              secretProvenance: { status: 'exact', entries: [] },
+            }),
+          })
+        ).status
+      ).toBe(400)
+      await db.delete(permissions).where(eq(permissions.userId, f.editorId))
+      expect((await completePrivateUpload(transport, f.projectId, session)).status).toBe(403)
+      expect(
+        await db.select().from(workspaceFiles).where(eq(workspaceFiles.projectId, f.projectId))
+      ).toEqual([])
+      expect(await usage(f.organizationId)).toBe(0)
+      const current = await sessions.verifyUploadSessionToken(session.uploadToken)
+      expect(current.completedFileId).toBeNull()
+      expect(current.metadata.projectFileSecretProvenance).toMatchObject({ pending: true })
+    }
+  )
+})
+
 afterAll(async () => {
   for (const f of fixtures) {
     await db.delete(uploadSession).where(inArray(uploadSession.userId, [f.ownerId, f.editorId]))
@@ -648,6 +914,7 @@ afterAll(async () => {
     await db.delete(user).where(inArray(user.id, [f.ownerId, f.editorId]))
   }
   await rm(storageRoot, { recursive: true, force: true })
+  if (redisKeys.length) await getRedisClient()?.del(...redisKeys)
   await closeRedisConnection()
   const report = process.env.PROJECT_UPLOAD_REPORT_PATH ?? 'test-results/project-upload.json'
   await mkdir(dirname(report), { recursive: true })
diff --git a/apps/sim/lib/projects/files/application/downloads.ts b/apps/sim/lib/projects/files/application/downloads.ts
index 4a85fe88843..7d81e33ec42 100644
--- a/apps/sim/lib/projects/files/application/downloads.ts
+++ b/apps/sim/lib/projects/files/application/downloads.ts
@@ -45,6 +45,7 @@ import {
   MAX_RENDERED_DOCUMENT_BYTES,
   needsRenderedArtifact,
 } from '@/lib/uploads/utils/file-utils'
+import { normalizeMimeType } from '@/lib/uploads/utils/mime'
 import { buildZipEntryPaths } from '@/lib/uploads/zip-entry-path'
 import {
   observeWorkspaceFileDelivery,
@@ -292,7 +293,7 @@ const snapshotMarkdownAssets = defineAuthorizedProjectFileUseCase<
     if (!source) throw new OrchestrationError('not_found', 'File not found')
     if (
       !isMarkdownFile({ name: source.originalName, type: source.contentType }) &&
-      source.contentType !== 'text/x-markdown'
+      normalizeMimeType(source.contentType) !== 'text/x-markdown'
     )
       throw new OrchestrationError('validation', 'Only Markdown files support snapshot export')
     if (
diff --git a/apps/sim/lib/projects/files/application/index.ts b/apps/sim/lib/projects/files/application/index.ts
index db351977f03..a149aee0d30 100644
--- a/apps/sim/lib/projects/files/application/index.ts
+++ b/apps/sim/lib/projects/files/application/index.ts
@@ -14,6 +14,7 @@ export {
 export { projectFileOperations } from './operations'
 export { readProjectFileCsvPreview, readProjectInlineFile } from './previews'
 export {
+  getProjectFileCapabilities,
   getProjectFileMetadata,
   listProjectFileItems,
   listProjectFiles,
diff --git a/apps/sim/lib/projects/files/application/read.ts b/apps/sim/lib/projects/files/application/read.ts
index b87955454f5..9b4986eda4d 100644
--- a/apps/sim/lib/projects/files/application/read.ts
+++ b/apps/sim/lib/projects/files/application/read.ts
@@ -37,6 +37,14 @@ interface ListProjectFilesResult {
   capabilities: { canRead: true; canWrite: boolean }
 }
 
+/** Capability hints describe this request's authority; later operations always reauthorize. */
+export const getProjectFileCapabilities = defineAuthorizedProjectFileUseCase({
+  operation: projectFileOperations.list,
+  async execute({ context }) {
+    return { owner: context.owner, canRead: true as const, canWrite: context.canWrite }
+  },
+})
+
 export const listProjectFiles = defineAuthorizedProjectFileUseCase<
   typeof projectFileOperations.list,
   ListProjectFilesInput,
diff --git a/apps/sim/lib/projects/rollout.server.ts b/apps/sim/lib/projects/rollout.server.ts
index e729904da82..2101f22a62f 100644
--- a/apps/sim/lib/projects/rollout.server.ts
+++ b/apps/sim/lib/projects/rollout.server.ts
@@ -14,7 +14,7 @@ export async function requireProjectApiEnabled(): Promise<void> {
 }
 
 /** Deployment-wide cutover follows ownership backfill and compatible storage/worker rollout. */
-async function isProjectFileApiEnabled(): Promise<boolean> {
+export async function isProjectFileApiEnabled(): Promise<boolean> {
   return (
     (await isFeatureEnabled('projects')) && (envBoolean(getEnv('PROJECT_FILES_ENABLED')) ?? false)
   )
diff --git a/apps/sim/lib/uploads/client/download.ts b/apps/sim/lib/uploads/client/download.ts
index 0f528f75da3..cc09cc26a68 100644
--- a/apps/sim/lib/uploads/client/download.ts
+++ b/apps/sim/lib/uploads/client/download.ts
@@ -1,16 +1,107 @@
 import { PASTE_LIMITS, utf8ByteLength } from '@sim/utils/paste'
 import { requestRaw } from '@/lib/api/client/request'
+import {
+  downloadProjectFileItemsContract,
+  exportProjectFileSnapshotContract,
+} from '@/lib/api/contracts/project-file-downloads'
+import {
+  type ProjectFileRecord,
+  readProjectFileArtifactContract,
+  readProjectFileContentContract,
+} from '@/lib/api/contracts/project-files'
 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 { normalizeMimeType } from '@/lib/uploads/utils/mime'
+import {
+  type FileOwnerAdapters,
+  requireFileOwnerAdapter,
+} from '@/lib/workspace-files/owner-adapters'
+import type { EditableFileOwner } from '@/lib/workspace-files/ownership'
 
 /** Action-time content from the mounted viewer, scoped so another file cannot consume it. */
-export interface FileDownloadSource {
+export type FileDownloadSource = {
   fileId: string
-  workspaceId: string
   getContent: () => string | null
+} & (
+  | { workspaceId: string; owner?: never }
+  | { owner: { entityType: 'project'; entityId: string }; workspaceId?: never }
+)
+
+interface FileDownloadAdapter {
+  exportSnapshot: (ownerId: string, fileId: string, content: string) => Promise<Response>
+  downloadArchive: (ownerId: string, fileIds: string[], folderIds: string[]) => Promise<Response>
+  archiveName: string
+}
+
+const OWNER_DOWNLOADS: FileOwnerAdapters<FileDownloadAdapter> = {
+  workspace: {
+    exportSnapshot: (ownerId, fileId, content) =>
+      requestRaw(
+        exportWorkspaceFileSnapshotContract,
+        { params: { id: ownerId, fileId }, body: { content } },
+        { cache: 'no-store' }
+      ),
+    downloadArchive: (ownerId, fileIds, folderIds) =>
+      requestRaw(
+        downloadWorkspaceFileItemsContract,
+        { params: { id: ownerId }, query: { fileIds, folderIds } },
+        { cache: 'no-store' }
+      ),
+    archiveName: 'workspace-files.zip',
+  },
+  project: {
+    exportSnapshot: (ownerId, fileId, content) =>
+      requestRaw(
+        exportProjectFileSnapshotContract,
+        { params: { id: ownerId, fileId }, body: { content } },
+        { cache: 'no-store' }
+      ),
+    downloadArchive: (ownerId, fileIds, folderIds) =>
+      requestRaw(
+        downloadProjectFileItemsContract,
+        { params: { id: ownerId }, query: { fileIds, folderIds } },
+        { cache: 'no-store' }
+      ),
+    archiveName: 'project-files.zip',
+  },
+}
+
+async function downloadMarkdownSnapshot(
+  owner: EditableFileOwner,
+  record: { id: string; name: string },
+  source?: FileDownloadSource | null
+): Promise<boolean> {
+  if (!source || source.fileId !== record.id) return false
+  const sourceOwner = source.owner ?? {
+    entityType: 'workspace',
+    entityId: source.workspaceId,
+  }
+  if (sourceOwner.entityType !== owner.entityType || sourceOwner.entityId !== owner.entityId) {
+    return false
+  }
+  const content = source.getContent()
+  if (content === null) return false
+  await exportMarkdownSnapshot(owner, record, content)
+  return true
+}
+
+async function exportMarkdownSnapshot(
+  owner: EditableFileOwner,
+  record: { id: string; name: string },
+  content: string
+): Promise<void> {
+  // Source editing accepts larger drafts than the bounded image-bundling endpoint.
+  if (
+    utf8ByteLength(content, PASTE_LIMITS.RICH_MARKDOWN_BYTES) > PASTE_LIMITS.RICH_MARKDOWN_BYTES
+  ) {
+    saveBlob(new Blob([content], { type: 'text/markdown; charset=utf-8' }), record.name)
+    return
+  }
+  const adapter = requireFileOwnerAdapter(OWNER_DOWNLOADS, owner)
+  const response = await adapter.exportSnapshot(owner.entityId, record.id, content)
+  saveBlob(await response.blob(), fileNameFromDisposition(response, record.name))
 }
 
 export function saveBlob(blob: Blob, fileName: string): void {
@@ -46,33 +137,16 @@ export async function triggerFileDownload(
   source?: FileDownloadSource | null
 ): Promise<void> {
   const isMarkdown = isMarkdownFile(record) || normalizeMimeType(record.type) === 'text/x-markdown'
-
-  const content =
+  if (
     isMarkdown &&
     record.vfsNamespace !== 'uploads' &&
     (record.storageContext ?? 'workspace') === 'workspace' &&
-    source?.fileId === record.id &&
-    source.workspaceId === record.workspaceId
-      ? source.getContent()
-      : null
-
-  if (content !== null) {
-    /** Source editing accepts larger drafts than the bounded image-bundling endpoint. */
-    if (
-      utf8ByteLength(content, PASTE_LIMITS.RICH_MARKDOWN_BYTES) > PASTE_LIMITS.RICH_MARKDOWN_BYTES
-    ) {
-      saveBlob(new Blob([content], { type: 'text/markdown; charset=utf-8' }), record.name)
-      return
-    }
-    const response = await requestRaw(
-      exportWorkspaceFileSnapshotContract,
-      {
-        params: { id: record.workspaceId, fileId: record.id },
-        body: { content },
-      },
-      { cache: 'no-store' }
-    )
-    saveBlob(await response.blob(), fileNameFromDisposition(response, record.name))
+    (await downloadMarkdownSnapshot(
+      { entityType: 'workspace', entityId: record.workspaceId },
+      record,
+      source
+    ))
+  ) {
     return
   }
 
@@ -90,25 +164,47 @@ export async function triggerFileDownload(
   saveBlob(await response.blob(), fileNameFromDisposition(response, record.name))
 }
 
+/** Downloads the selected Project's rendered artifact, preserving an open Markdown draft. */
+export async function triggerProjectFileDownload(
+  record: ProjectFileRecord,
+  source?: FileDownloadSource | null
+): Promise<void> {
+  if (isMarkdownFile(record) || normalizeMimeType(record.type) === 'text/x-markdown') {
+    if (await downloadMarkdownSnapshot(record.owner, record, source)) return
+    const response = await requestRaw(
+      readProjectFileContentContract,
+      { params: { id: record.owner.entityId, fileId: record.id } },
+      { cache: 'no-store' }
+    )
+    await exportMarkdownSnapshot(record.owner, record, await response.text())
+    return
+  }
+  const response = await requestRaw(
+    readProjectFileArtifactContract,
+    { params: { id: record.owner.entityId, fileId: record.id }, query: {} },
+    { cache: 'no-store' }
+  )
+  saveBlob(await response.blob(), fileNameFromDisposition(response, record.name))
+}
+
 /**
  * Download a selection of files as a zip. Fetched rather than navigated to, so a
  * rejection — a document still compiling, an entry too large — surfaces as an error the
  * caller can show in place instead of replacing the page with raw JSON. `requestRaw`
  * throws an `ApiClientError` carrying the route's own message.
  */
-export async function triggerArchiveDownload(input: {
-  workspaceId: string
-  fileIds?: string[]
-  folderIds?: string[]
-}): Promise<void> {
-  const response = await requestRaw(
-    downloadWorkspaceFileItemsContract,
-    {
-      params: { id: input.workspaceId },
-      query: { fileIds: input.fileIds ?? [], folderIds: input.folderIds ?? [] },
-    },
-    { cache: 'no-store' }
+export async function triggerArchiveDownload(
+  input: { fileIds?: string[]; folderIds?: string[] } & (
+    | { workspaceId: string; owner?: never }
+    | { owner: EditableFileOwner; workspaceId?: never }
   )
-
-  saveBlob(await response.blob(), fileNameFromDisposition(response, 'workspace-files.zip'))
+): Promise<void> {
+  const owner = input.owner ?? { entityType: 'workspace', entityId: input.workspaceId }
+  const adapter = requireFileOwnerAdapter(OWNER_DOWNLOADS, owner)
+  const response = await adapter.downloadArchive(
+    owner.entityId,
+    input.fileIds ?? [],
+    input.folderIds ?? []
+  )
+  saveBlob(await response.blob(), fileNameFromDisposition(response, adapter.archiveName))
 }
diff --git a/apps/sim/lib/uploads/client/session-upload.ts b/apps/sim/lib/uploads/client/session-upload.ts
index ee8c383ac1a..9a44346093d 100644
--- a/apps/sim/lib/uploads/client/session-upload.ts
+++ b/apps/sim/lib/uploads/client/session-upload.ts
@@ -9,6 +9,12 @@ import {
   type KnowledgeDocumentUploadSummary,
   type KnowledgeDocumentUploadTransfer,
 } from '@/lib/api/contracts/knowledge/upload-sessions'
+import {
+  abortProjectFileUploadContract,
+  completeProjectFileUploadContract,
+  createProjectFileUploadContract,
+  getProjectFileUploadPartUrlsContract,
+} from '@/lib/api/contracts/project-file-uploads'
 import {
   abortInternalFileUploadContract,
   type CreateInternalFileUploadBody,
@@ -29,6 +35,14 @@ interface UploadWorkspaceFileSessionParams {
   onProgress?: (event: UploadProgressEvent) => void
 }
 
+interface UploadProjectFileSessionParams {
+  projectId: string
+  folderId?: string | null
+  file: File
+  signal?: AbortSignal
+  onProgress?: (event: UploadProgressEvent) => void
+}
+
 interface InternalUploadCommonParams {
   file: File
   signal?: AbortSignal
@@ -103,6 +117,50 @@ export async function uploadWorkspaceFileSession(params: UploadWorkspaceFileSess
   })
 }
 
+export async function uploadProjectFileSession(params: UploadProjectFileSessionParams) {
+  const { projectId, file, signal, onProgress } = params
+  const created = await requestJson(createProjectFileUploadContract, {
+    params: { id: projectId },
+    body: {
+      name: file.name,
+      contentType: getFileContentType(file),
+      size: file.size,
+      folderId: params.folderId ?? undefined,
+    },
+    signal,
+  })
+  const target = { id: projectId, uploadId: created.session.id }
+  const headers = { 'upload-token': created.uploadToken }
+  return runCreatedUpload({
+    file,
+    transfer: created.transfer,
+    signal,
+    onProgress,
+    getPartUrls: async (partNumbers) => {
+      const result = await requestJson(getProjectFileUploadPartUrlsContract, {
+        params: target,
+        headers,
+        body: { partNumbers },
+        signal,
+      })
+      return result.parts
+    },
+    complete: async () => {
+      const completed = await requestJson(completeProjectFileUploadContract, {
+        params: target,
+        headers,
+        body: {},
+        signal,
+      })
+      if (!completed.result) throw new Error('Completed Project upload returned no file')
+      return completed.result
+    },
+    abort: async () => {
+      await requestJson(abortProjectFileUploadContract, { params: target, headers })
+    },
+  })
+}
+
 export async function uploadInternalFileSession<Purpose extends InternalUploadPurpose>(
   params: InternalUploadCommonParams & Extract<InternalUploadContext, { purpose: Purpose }>
 ): Promise<InternalUploadResult<Purpose>> {
diff --git a/apps/sim/lib/workspace-files/browser.ts b/apps/sim/lib/workspace-files/browser.ts
index d18d7be4dd5..4201efe7b9a 100644
--- a/apps/sim/lib/workspace-files/browser.ts
+++ b/apps/sim/lib/workspace-files/browser.ts
@@ -1,9 +1,40 @@
+import { getFileExtension, resolveEffectiveMimeType } from '@/lib/uploads/utils/file-utils'
+
 export const FILE_BROWSER_SORTS = ['name', 'size', 'type', 'created', 'owner', 'updated'] as const
 export type FileBrowserSort = (typeof FILE_BROWSER_SORTS)[number]
 export const FILE_BROWSER_TYPES = ['document', 'image', 'audio', 'video'] as const
 export const FILE_BROWSER_SIZES = ['small', 'medium', 'large'] as const
 export const FILE_BROWSER_SIZE_BOUNDARIES = { small: 1_048_576, medium: 10_485_760 } as const
 
+export const FILE_BROWSER_TYPE_OPTIONS = [
+  { value: 'document', label: 'Documents' },
+  { value: 'image', label: 'Images' },
+  { value: 'audio', label: 'Audio' },
+  { value: 'video', label: 'Video' },
+] as const
+export const FILE_BROWSER_SIZE_OPTIONS = [
+  { value: 'small', label: 'Small (< 1 MB)' },
+  { value: 'medium', label: 'Medium (1–10 MB)' },
+  { value: 'large', label: 'Large (> 10 MB)' },
+] as const
+export const FILE_BROWSER_COLUMNS = [
+  { id: 'name', header: 'Name', widthMultiplier: 1.15 },
+  { id: 'size', header: 'Size', widthMultiplier: 0.85 },
+  { id: 'type', header: 'Type', widthMultiplier: 1 },
+  { id: 'created', header: 'Created' },
+  { id: 'owner', header: 'Owner' },
+  { id: 'updated', header: 'Last Updated' },
+] as const
+
+export const FILE_BROWSER_SORT_OPTIONS = [
+  { id: 'name', label: 'Name' },
+  { id: 'size', label: 'Size' },
+  { id: 'type', label: 'Type' },
+  { id: 'created', label: 'Created' },
+  { id: 'updated', label: 'Last Updated' },
+  { id: 'owner', label: 'Owner' },
+] as const
+
 export const FILE_BROWSER_MIME_LABELS: Readonly<Record<string, string>> = {
   'application/pdf': 'PDF',
   'application/zip': 'ZIP',
@@ -22,6 +53,17 @@ export const FILE_BROWSER_MIME_LABELS: Readonly<Record<string, string>> = {
   'text/markdown': 'Markdown',
 }
 
+/** The displayed file kind also supplies the browser's type ordering. */
+export function formatFileBrowserType(storedType: string | null, filename: string): string {
+  const mime = resolveEffectiveMimeType(storedType, filename)
+  if (FILE_BROWSER_MIME_LABELS[mime]) return FILE_BROWSER_MIME_LABELS[mime]
+  if (mime.startsWith('audio/')) return 'Audio'
+  if (mime.startsWith('video/')) return 'Video'
+  if (mime.startsWith('image/')) return 'Image'
+  const extension = getFileExtension(filename)
+  return extension ? extension.toUpperCase() : (storedType ?? 'File')
+}
+
 export interface FileBrowserCreator {
   id: string
   name: string
@@ -46,3 +88,5 @@ export interface FileBrowserFilters {
   sizes?: readonly (typeof FILE_BROWSER_SIZES)[number][]
   creatorIds?: readonly string[]
 }
+
+export const FILE_ROW_DRAG_MIME = 'application/x-sim-workspace-file-rows'
diff --git a/apps/sim/lib/workspace-files/ownership.ts b/apps/sim/lib/workspace-files/ownership.ts
index 223e3ad8e6c..e1f038ac408 100644
--- a/apps/sim/lib/workspace-files/ownership.ts
+++ b/apps/sim/lib/workspace-files/ownership.ts
@@ -7,6 +7,12 @@ export interface FileOwner {
   entityId: string
 }
 
+/** An asserted file target; application authorization verifies its persisted owner. */
+export interface OwnedFileTarget {
+  owner: FileOwner
+  fileId: string
+}
+
 /** Owners whose durable files support the shared Files editor and folder lifecycle. */
 export interface EditableFileOwner {
   entityType: 'workspace' | 'project'
diff --git a/apps/sim/scripts/test-project-file-inline-source-e2e.ts b/apps/sim/scripts/test-project-file-inline-source-e2e.ts
index c594e4a0cbd..af84a0d6a61 100644
--- a/apps/sim/scripts/test-project-file-inline-source-e2e.ts
+++ b/apps/sim/scripts/test-project-file-inline-source-e2e.ts
@@ -3,7 +3,10 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import { dirname, join } from 'node:path'
 import { getErrorMessage } from '@sim/utils/errors'
 import { toArray, toRecord } from '@sim/utils/object'
-import { createPublicFileContentSource } from '@/hooks/use-file-content-source'
+import {
+  createOwnedFileContentSource,
+  createPublicFileContentSource,
+} from '@/hooks/use-file-content-source'
 
 const base = new URL(required(process.env.PROJECT_INLINE_SOURCE_BASE_URL))
 assert.ok(['127.0.0.1', 'localhost', '[::1]'].includes(base.hostname))
@@ -24,6 +27,7 @@ const contentPath = `/api/files/public/${token}/content`
 const ownPath = `/api/projects/${owner.entityId}/files/${required(doc.imageId)}/content`
 const foreignPath = `/api/projects/${required(foreign.projectId)}/files/${required(foreign.fileId)}/content`
 const publicSource = createPublicFileContentSource(token, contentPath, owner)
+const privateSource = createOwnedFileContentSource(owner, required(doc.fileId))
 const checks: { name: string; passed: boolean; durationMs: number; error?: string }[] = []
 
 function required(value: unknown): string {
@@ -109,8 +113,9 @@ await check(
     )
   }
 )
-await check('Public sources omit foreign-owner private image URLs', async () => {
+await check('Public and private sources omit foreign-owner private image URLs', async () => {
   assert.equal(publicSource.resolveImageSrc(foreignPath), undefined)
+  assert.equal(privateSource.resolveImageSrc(foreignPath), undefined)
 })
 
 await mkdir(dirname(reportPath), { recursive: true })
diff --git a/apps/sim/stores/panel/types.ts b/apps/sim/stores/panel/types.ts
index a0b61a016c0..b3d322c5dc6 100644
--- a/apps/sim/stores/panel/types.ts
+++ b/apps/sim/stores/panel/types.ts
@@ -1,5 +1,6 @@
 import type { MothershipTableViewContext } from '@/lib/api/contracts/mothership-resources'
 import type { ManagedMcpConnectorId } from '@/lib/credential-groups/managed-mcp-connectors'
+import type { FileOperationOwner } from '@/lib/mothership/generated/file-owner'
 
 /**
  * Available panel tabs
@@ -78,10 +79,11 @@ export type ChatContext =
        */
       columnIds?: string[]
     } & WorkspaceOwned)
-  | ({ kind: 'file'; fileId: string; label: string } & WorkspaceOwned)
+  | ({ kind: 'file'; fileId: string; label: string; owner?: FileOperationOwner } & WorkspaceOwned)
   | ({ kind: 'dashboard'; dashboardId: string; label: string } & WorkspaceOwned)
   | ({
       kind: 'file_selection'
+      owner?: FileOperationOwner
       fileId: string
       label: string
       /** Name of the file the selection came from. See `tableName` above. */
@@ -104,6 +106,7 @@ export type ChatContext =
   | ({ kind: 'filefolder'; fileFolderId: string; label: string } & WorkspaceOwned)
   /** A whole workspace in an organization chat: "I'm working in this one". */
   | { kind: 'workspace'; workspaceId: string; label: string }
+  | { kind: 'project'; projectId: string; label: string }
   | { kind: 'docs'; label: string }
   /**
    * A tab in the desktop browser or terminal panel, dragged into the input to