diff --git a/CONTEXT.md b/CONTEXT.md
new file mode 100644
index 000000000..e774e8292
--- /dev/null
+++ b/CONTEXT.md
@@ -0,0 +1,88 @@
+# WhoDB Data Exploration Context
+
+WhoDB helps users inspect and manipulate database storage units across relational and document databases. This context records product language for database exploration views.
+
+## Language
+
+**MongoDB Collection**:
+A MongoDB storage unit made of documents that may not all share the same fields.
+_Avoid_: MongoDB table
+
+**MongoDB Document**:
+A single record inside a **MongoDB Collection**.
+_Avoid_: row, JSON row
+
+**JSON View**:
+The MongoDB collection view that shows each **MongoDB Document** as editable JSON.
+_Avoid_: card-only view
+
+**Collection Table View**:
+A MongoDB collection view that presents documents in a grid using document fields as columns.
+_Avoid_: MongoDB table
+
+**Sampled Field Set**:
+A field list inferred from a limited sample of documents for the **Collection Table View**.
+_Avoid_: complete schema
+
+**Unset Field**:
+A field that exists as a column in the **Collection Table View** but is absent from a specific **MongoDB Document**.
+_Avoid_: null, empty string
+
+**Editable Scalar Field**:
+A top-level document field whose value can be edited directly in a **Collection Table View** cell.
+_Avoid_: editable nested field
+
+**Complex Document Field**:
+A top-level document field whose value is an object or array and should not be edited inline in a **Collection Table View** cell.
+_Avoid_: inline JSON cell
+
+**Field JSON Editor**:
+A focused editor for changing a single object or array field from the **Collection Table View**.
+_Avoid_: document table mode
+
+**Document JSON Editor**:
+The editor for changing an entire **MongoDB Document** as JSON.
+_Avoid_: document table mode, field-level editor
+
+## Relationships
+
+- A **MongoDB Collection** contains zero or more **MongoDB Documents**.
+- A **JSON View** displays **MongoDB Documents** in their native document shape.
+- A **Collection Table View** presents **MongoDB Documents** as rows while preserving MongoDB's flexible field model.
+- A **Sampled Field Set** guides the columns shown in a **Collection Table View** but does not represent a complete MongoDB schema.
+- An **Unset Field** is distinct from a field whose stored value is `null`.
+- Editing an **Unset Field** creates that field on the affected **MongoDB Document**.
+- An **Editable Scalar Field** can be edited inline in the **Collection Table View**.
+- Editing an **Editable Scalar Field** preserves the existing field type when the field already exists, except when the input is a complete, valid, unquoted JSON object or array.
+- A **Complex Document Field** in the **Collection Table View** can open a **Field JSON Editor**.
+- A **Field JSON Editor** accepts any valid JSON value, even when that changes an object or array field into a scalar or `null`.
+- A **MongoDB Document** is edited through a **Document JSON Editor**.
+- A **Complex Document Field** is not edited through a separate field-level interaction inside the **Document JSON Editor**.
+
+## Example Dialogue
+
+> **Dev:** "Should MongoDB open in the table by default?"
+> **Domain expert:** "Yes. Open MongoDB collections in the **Collection Table View** by default because users expect a grid for browsing. Keep the **JSON View** available as a switchable document-focused view."
+
+## Flagged Ambiguities
+
+### Terminology
+
+- "table view" in MongoDB means **Collection Table View**, not a relational database table.
+- The document editor should be a **Document JSON Editor**, not a table view, field list, or field-level editor.
+- The **Collection Table View** is the default MongoDB collection view.
+- The **Collection Table View** should build its first column set from a limited default sample, not by scanning the full collection.
+- The **Collection Table View** supports sorting and filtering on top-level document fields.
+
+### MongoDB Table Editing
+
+- MongoDB inline editing is limited to **Editable Scalar Fields**; object and array cells in the **Collection Table View** open a **Field JSON Editor**.
+- A **Field JSON Editor** validates JSON syntax only. It does not force the edited value to remain an object or array.
+- Empty input or clearing an existing field is not field deletion; field deletion must be a distinct action.
+- Editing a `null` or **Unset Field** in the **Collection Table View** creates a string value unless the input is a complete, valid, unquoted JSON object or array.
+- Typing a complete, valid, unquoted JSON object or array into any **Editable Scalar Field** changes that field into a **Complex Document Field**.
+
+### MongoDB View State
+
+- Switching between **Collection Table View** and **JSON View** preserves pending document changes.
+- Pending changes from **Collection Table View** and **JSON View** share the same document-level preview and submission flow.
diff --git a/README.md b/README.md
index 61ec832d2..5d89da5f5 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ cd dataflow
 pnpm install
 
 # Terminal 1: backend
-cd ../core
+cd core
 set -a
 source .env.local
 set +a
diff --git a/dataflow/docs/semantic-test-contract.md b/dataflow/docs/semantic-test-contract.md
index 3292943e1..1a26c98d9 100644
--- a/dataflow/docs/semantic-test-contract.md
+++ b/dataflow/docs/semantic-test-contract.md
@@ -49,7 +49,7 @@
 | SQL table row/cell | `src/components/database/sql/TableView/TableView.DataGrid.tsx` | `sql.table.row`, `sql.table.row-selector`, `sql.table.cell`, `sql.table.cell-editor` | item/field/action | Editable table rows and cells | `object=table-row/table-cell`, `field`, `resource-id=rowKey`, `state=ready/selected/inserted/deleted/editable/editing/changed/read_only`, `disabled-reason=read_only/primary_key/row_deleted` | Yes | Yes | rendered row state | High |
 | Shared data view filter/error | `src/components/database/shared/*` | `data-view.filter-button`, `data-view.error`, `data-view.retry-button` | action/error | Data filter and load failure retry | `module=data-view`, `object=filter/data-load`, `action=open/retry`, `state=active/inactive/error`, `error-code=data_load_failed` | Yes | Yes | shared data view state | Medium |
 | MongoDB collection detail | `src/components/database/mongodb/CollectionDetailView.tsx` | `mongodb.collection.detail`, `mongodb.collection.detail-loading` | panel/state | Collection document detail | `connection-id`, `database`, `resource-type=collection`, `resource-id=collectionName`, `state=ready/loading/error` | No | Yes | collection provider state | High |
-| MongoDB toolbar actions | `src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx` | `mongodb.collection.*-button` | action | Refresh, add/delete document, undo, preview, submit, export, query, chart | `action=refresh/create/mark-delete/undo/preview/submit/export/open-query/create-chart`, `risk=resource_mutation`, `disabled-reason` | Yes | Yes | collection actions | High |
+| MongoDB toolbar actions | `src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx` | `mongodb.collection.*-button`, `mongodb.collection.view-toggle-button` | action | Refresh, switch collection view, add/delete document, undo, preview, submit, export, query, chart | `action=refresh/switch-to-table/switch-to-json/create/mark-delete/undo/preview/submit/export/open-query/create-chart`, `state=table/json`, `risk=resource_mutation`, `disabled-reason` | Yes | Yes | collection actions and view mode | High |
 | MongoDB document list/card | `src/components/database/mongodb/CollectionView/CollectionView.DocumentList.tsx` | `mongodb.collection.document-list-region`, `mongodb.collection.document-card`, `mongodb.collection.edit-document-button`, `mongodb.collection.document-list-empty` | item/action/state | Documents, edit action, empty list | `object=document/document-list`, `state=ready/selected/insert/update/delete/empty`, `resource-type=document`, `resource-id=rowKey` | Yes | Yes | document changeset state | High |
 | Redis key detail | `src/components/database/redis/RedisKeyDetailView.tsx` | `redis.key.detail`, `redis.key.detail-loading` | panel/state | Redis key value detail | `connection-id`, `database`, `resource-type=redis_key`, `resource-id=keyName`, `key-type`, `state=ready/loading/mutating/error` | No | Yes | Redis key rows | High |
 | Redis key toolbar actions | `src/components/database/redis/RedisKeyDetailView.tsx` | `redis.key.*-button` | action | Refresh, add/delete row, export, query, chart | `action=refresh/create/delete/export/open-query/create-chart`, `risk=resource_mutation`, `disabled-reason` | Yes | Yes | Redis key handlers | High |
@@ -67,7 +67,7 @@
 | Layout/activity/tab | `connections`, `analysis`, `active`, `inactive`, `dirty`, `empty` | Shell navigation state |
 | Sidebar node | `selected`, `idle`, `expanded`, `collapsed`, `leaf`, `loading` | Combined as a space-separated state string when multiple apply |
 | SQL editor/result | `ready`, `executing`, `completed`, `loading`, `success`, `error`, `empty` | Query execution and result display |
-| SQL/Mongo/Redis mutation surfaces | `ready`, `loading`, `dirty`, `mutating`, `inserted`, `deleted`, `changed`, `selected`, `editable`, `editing`, `read_only`, `creating` | Table/document/key editing |
+| SQL/Mongo/Redis mutation surfaces | `ready`, `loading`, `dirty`, `mutating`, `inserted`, `deleted`, `changed`, `selected`, `editable`, `editing`, `read_only`, `creating`, `table`, `json` | Table/document/key editing and MongoDB collection view mode |
 | Analysis dashboard/widget | `ready`, `empty`, `active`, `inactive`, `editable`, `read_only`, `idle`, `loading`, `success`, `error`, `editing` | Dashboard and widget runtime |
 
 ## 5. Disabled Reason Enums
diff --git a/dataflow/src/components/database/mongodb/CollectionDetailView.tsx b/dataflow/src/components/database/mongodb/CollectionDetailView.tsx
index b4c187b76..53269eff5 100644
--- a/dataflow/src/components/database/mongodb/CollectionDetailView.tsx
+++ b/dataflow/src/components/database/mongodb/CollectionDetailView.tsx
@@ -1,10 +1,12 @@
 import { useMemo } from 'react'
 import { CollectionViewProvider, useCollectionView } from './CollectionView/CollectionViewProvider'
 import { CollectionViewDocumentList } from './CollectionView/CollectionView.DocumentList'
+import { CollectionViewTableGrid } from './CollectionView/CollectionView.TableGrid'
 import { CollectionViewToolbar } from './CollectionView/CollectionView.Toolbar'
 import { AddDocumentModal } from './CollectionView/CollectionView.AddDocumentModal'
 import { EditDocumentModal } from './CollectionView/CollectionView.EditDocumentModal'
 import { buildPreviewCommands, summarizeChanges } from './CollectionView/changeset-mongo-preview'
+import { buildRenderedMongoDocuments } from './CollectionView/mongo-table-utils'
 import { DataView } from '@/components/database/shared/DataView'
 import { FindBar } from '@/components/database/shared/FindBar'
 import { ExportCollectionModal } from './ExportCollectionModal'
@@ -59,6 +61,8 @@ function CollectionDetailViewContent({ databaseName, collectionName, connectionI
 
   /** Extract all top-level field names from visible documents for FindBar. */
   const docColumns = useMemo(() => {
+    if (state.viewMode === 'table') return state.tableColumns
+
     const keys = new Set<string>()
     state.documents.forEach((doc) => {
       if (typeof doc === 'object' && doc !== null) {
@@ -66,7 +70,21 @@ function CollectionDetailViewContent({ databaseName, collectionName, connectionI
       }
     })
     return Array.from(keys)
-  }, [state.documents])
+  }, [state.documents, state.tableColumns, state.viewMode])
+
+  const findRows = useMemo(() => {
+    if (state.viewMode === 'table') {
+      const pageOffset = (state.currentPage - 1) * state.pageSize
+      return buildRenderedMongoDocuments({
+        documents: state.documents as Record<string, unknown>[],
+        changes: state.changes,
+        newRowOrder: state.newRowOrder,
+        pageOffset,
+      }).map((row) => row.doc)
+    }
+
+    return state.documents
+  }, [state.changes, state.currentPage, state.documents, state.newRowOrder, state.pageSize, state.viewMode])
 
   return (
     <div
@@ -87,21 +105,23 @@ function CollectionDetailViewContent({ databaseName, collectionName, connectionI
         <DataView.Error message={state.error} />
       ) : (
         <FindBar.Provider
-          rows={state.documents}
+          rows={findRows}
           columns={docColumns}
-          searchTerm={state.searchTerm}
-          onSearchTermChange={actions.setSearchTerm}
         >
           <FindBar.Bar />
-          <div
-            className="flex-1 overflow-auto p-4 space-y-4"
-            data-testid="mongodb.collection.document-list-region"
-            data-qa-module="mongodb"
-            data-qa-object="document-list"
-            data-qa-state={state.documents.length > 0 ? 'ready' : 'empty'}
-          >
-            <CollectionViewDocumentList />
-          </div>
+          {state.viewMode === 'table' ? (
+            <CollectionViewTableGrid />
+          ) : (
+            <div
+              className="flex-1 overflow-auto p-4 space-y-4"
+              data-testid="mongodb.collection.document-list-region"
+              data-qa-module="mongodb"
+              data-qa-object="document-list"
+              data-qa-state={state.documents.length > 0 ? 'ready' : 'empty'}
+            >
+              <CollectionViewDocumentList />
+            </div>
+          )}
         </FindBar.Provider>
       )}
 
@@ -151,6 +171,7 @@ function CollectionDetailViewContent({ databaseName, collectionName, connectionI
         onOpenChange={actions.setIsFilterModalOpen}
         onApply={actions.handleFilterApply}
         fields={state.availableFields}
+        preferredField={state.preferredFilterField}
         initialFilter={state.activeFilter}
       />
 
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.AddDocumentModal.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.AddDocumentModal.tsx
index 7dc0190fb..920226978 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.AddDocumentModal.tsx
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.AddDocumentModal.tsx
@@ -12,7 +12,7 @@ export function AddDocumentModal(
       title={t('mongodb.document.addTitle')}
       submitLabel={t('mongodb.document.add')}
       description={t('mongodb.document.addDescription')}
-      placeholder="{ ... }"
+      placeholder={t('mongodb.document.placeholder')}
       {...props}
     />
   )
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.ColumnHeader.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.ColumnHeader.tsx
new file mode 100644
index 000000000..9da6865d2
--- /dev/null
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.ColumnHeader.tsx
@@ -0,0 +1,127 @@
+import {
+  ArrowDownAZ,
+  ArrowUpAZ,
+  ListFilter,
+  MoreHorizontal,
+  X,
+} from 'lucide-react'
+import { Badge } from '@/components/ui/Badge'
+import { Button } from '@/components/ui/Button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { useI18n } from '@/i18n/useI18n'
+import { cn } from '@/lib/utils'
+import { useCollectionView } from './CollectionViewProvider'
+
+interface CollectionViewColumnHeaderProps {
+  column: string
+  index: number
+}
+
+/** Renders a MongoDB collection table column header with sort and filter actions. */
+export function CollectionViewColumnHeader({ column, index }: CollectionViewColumnHeaderProps) {
+  const { t } = useI18n()
+  const { state, actions } = useCollectionView()
+  const isSorted = state.sortColumn === column
+  const hasFilter = Object.prototype.hasOwnProperty.call(state.activeFilter, column)
+  const width = state.columnWidths[column] || 160
+
+  return (
+    <th
+      style={{ minWidth: `${width}px`, ...(state.resizedColumns.has(column) && { maxWidth: `${width}px` }) }}
+      className="sticky top-0 z-40 overflow-hidden border-b border-r border-border/50 bg-background px-4 py-2 text-left text-sm font-medium text-muted-foreground select-none"
+    >
+      <div className="flex items-center justify-between gap-4">
+        <div className="flex min-w-0 flex-col">
+          <div className="flex min-w-0 items-center gap-1">
+            <span className="truncate" title={column}>{column}</span>
+            {column === '_id' && (
+              <Badge variant="secondary" className="h-4 shrink-0 px-1 py-0 text-[10px]">
+                {t('mongodb.table.idBadge')}
+              </Badge>
+            )}
+            {isSorted && (
+              <span className="shrink-0 text-primary">
+                {state.sortDirection === 'asc' ? <ArrowUpAZ className="h-3 w-3" /> : <ArrowDownAZ className="h-3 w-3" />}
+              </span>
+            )}
+            {hasFilter && <ListFilter className="h-3 w-3 shrink-0 text-primary" />}
+          </div>
+          <span className="truncate text-xs font-normal text-muted-foreground/80">
+            {t('mongodb.table.fieldType')}
+          </span>
+        </div>
+
+        <DropdownMenu
+          open={state.activeColumnMenu === column}
+          onOpenChange={(open) => actions.setActiveColumnMenu(open ? column : null)}
+        >
+          <DropdownMenuTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon-xs"
+              className={cn(
+                'shrink-0 text-muted-foreground',
+                state.activeColumnMenu === column && 'bg-muted text-foreground',
+              )}
+            >
+              <MoreHorizontal className="h-3.5 w-3.5" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align={index === 0 ? 'start' : 'end'} className="w-44">
+            <DropdownMenuLabel className="text-[10px] text-muted-foreground">
+              {t('mongodb.table.columnActions')}
+            </DropdownMenuLabel>
+            <DropdownMenuItem
+              onSelect={() => actions.handleSort(column, 'asc')}
+              className={cn(isSorted && state.sortDirection === 'asc' && 'bg-primary/5 font-medium text-primary')}
+            >
+              <ArrowUpAZ className="h-3.5 w-3.5" />
+              {t('mongodb.table.sortAsc')}
+            </DropdownMenuItem>
+            <DropdownMenuItem
+              onSelect={() => actions.handleSort(column, 'desc')}
+              className={cn(isSorted && state.sortDirection === 'desc' && 'bg-primary/5 font-medium text-primary')}
+            >
+              <ArrowDownAZ className="h-3.5 w-3.5" />
+              {t('mongodb.table.sortDesc')}
+            </DropdownMenuItem>
+            {isSorted && (
+              <DropdownMenuItem onSelect={() => actions.clearSort()}>
+                <X className="h-3.5 w-3.5" />
+                {t('mongodb.table.clearSort')}
+              </DropdownMenuItem>
+            )}
+            <DropdownMenuSeparator />
+            <DropdownMenuItem onSelect={() => actions.openFilterForField(column)}>
+              <ListFilter className="h-3.5 w-3.5" />
+              {t('mongodb.table.filterColumn')}
+            </DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <div
+        data-resize-col={column}
+        className={cn(
+          'absolute right-0 top-0 -bottom-px z-20 w-1 cursor-col-resize data-[resize-active]:bg-primary/50',
+          state.resizingColumn === column && 'bg-primary/50',
+        )}
+        onMouseEnter={() => {
+          if (state.resizingColumn) return
+          document.querySelectorAll<HTMLElement>(`[data-resize-col="${column}"]`).forEach(element => { element.dataset.resizeActive = '' })
+        }}
+        onMouseLeave={() => {
+          if (state.resizingColumn) return
+          document.querySelectorAll<HTMLElement>(`[data-resize-col="${column}"]`).forEach(element => { delete element.dataset.resizeActive })
+        }}
+        onMouseDown={(event) => actions.handleResizeStart(event, column)}
+      />
+    </th>
+  )
+}
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.DocumentEditorDialog.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.DocumentEditorDialog.tsx
index fab963f50..d882efe1f 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.DocumentEditorDialog.tsx
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.DocumentEditorDialog.tsx
@@ -1,7 +1,6 @@
 import { Dialog, DialogContent } from '@/components/ui/dialog'
 import { ModalForm } from '@/components/ui/ModalForm'
 import { Textarea } from '@/components/ui/Textarea'
-import { useI18n } from '@/i18n/useI18n'
 
 export interface DocumentEditorDialogProps {
   open: boolean
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.FieldJsonEditorDialog.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.FieldJsonEditorDialog.tsx
new file mode 100644
index 000000000..abfc6488a
--- /dev/null
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.FieldJsonEditorDialog.tsx
@@ -0,0 +1,63 @@
+import { Dialog, DialogContent } from '@/components/ui/dialog'
+import { ModalForm } from '@/components/ui/ModalForm'
+import { Textarea } from '@/components/ui/Textarea'
+import { useI18n } from '@/i18n/useI18n'
+
+interface FieldJsonEditorDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  fieldName: string
+  content: string
+  onContentChange: (content: string) => void
+  onSave: () => Promise<void>
+}
+
+/** Dialog for editing one MongoDB document field as a JSON value. */
+export function FieldJsonEditorDialog({
+  open,
+  onOpenChange,
+  fieldName,
+  content,
+  onContentChange,
+  onSave,
+}: FieldJsonEditorDialogProps) {
+  const { t } = useI18n()
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent
+        className="max-w-xl"
+        data-testid="mongodb.collection.field-json-dialog"
+        data-qa-module="mongodb"
+        data-qa-object="field-json-editor"
+        data-qa-state={open ? 'open' : 'closed'}
+        data-qa-field={fieldName}
+      >
+        <ModalForm.Provider
+          onSubmit={onSave}
+          meta={{
+            title: t('mongodb.fieldJson.editTitle', { field: fieldName }),
+            description: t('mongodb.fieldJson.description'),
+          }}
+        >
+          <ModalForm.Header />
+          <Textarea
+            className="min-h-[320px] resize-none p-4 font-mono"
+            value={content}
+            onChange={(event) => onContentChange(event.target.value)}
+            data-testid="mongodb.collection.field-json-textarea"
+            data-qa-module="mongodb"
+            data-qa-object="field-json-editor"
+            data-qa-action="edit"
+            data-qa-field={fieldName}
+          />
+          <ModalForm.Alert />
+          <ModalForm.Footer>
+            <ModalForm.CancelButton />
+            <ModalForm.SubmitButton label={t('mongodb.document.saveChanges')} />
+          </ModalForm.Footer>
+        </ModalForm.Provider>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.TableGrid.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.TableGrid.tsx
new file mode 100644
index 000000000..7101ab9a1
--- /dev/null
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.TableGrid.tsx
@@ -0,0 +1,332 @@
+import { use, useCallback, useMemo, useState, type KeyboardEvent as ReactKeyboardEvent } from 'react'
+import { FileJson } from 'lucide-react'
+import { useI18n } from '@/i18n/useI18n'
+import { cn } from '@/lib/utils'
+import { FindBarContext } from '@/components/database/shared/FindBar.Provider'
+import { useCollectionView } from './CollectionViewProvider'
+import { CollectionViewColumnHeader } from './CollectionView.ColumnHeader'
+import {
+  buildRenderedMongoDocuments,
+  coerceMongoCellDraft,
+  hasDocumentField,
+  isMongoCellChanged,
+  isMongoScalarValue,
+  parseMongoFieldJsonDraft,
+} from './mongo-table-utils'
+import { FieldJsonEditorDialog } from './CollectionView.FieldJsonEditorDialog'
+
+interface ActiveMongoCell {
+  rowKey: string
+  column: string
+  draftValue: string
+}
+
+interface ActiveMongoFieldJsonEditor {
+  rowKey: string
+  column: string
+  content: string
+}
+
+/** Renders the MongoDB collection table view with scalar inline editing. */
+export function CollectionViewTableGrid() {
+  const { t } = useI18n()
+  const { state, actions } = useCollectionView()
+  const findBar = use(FindBarContext)
+  const [activeCell, setActiveCell] = useState<ActiveMongoCell | null>(null)
+  const [fieldJsonEditor, setFieldJsonEditor] = useState<ActiveMongoFieldJsonEditor | null>(null)
+
+  const pageOffset = (state.currentPage - 1) * state.pageSize
+  const renderedDocs = useMemo(() => buildRenderedMongoDocuments({
+    documents: state.documents as Record<string, unknown>[],
+    changes: state.changes,
+    newRowOrder: state.newRowOrder,
+    pageOffset,
+  }), [pageOffset, state.changes, state.documents, state.newRowOrder])
+
+  const openCellEditor = useCallback((rowKey: string, column: string, value: unknown, fieldExists: boolean) => {
+    if (column === '_id') return
+    if (fieldExists && !isMongoScalarValue(value)) {
+      setActiveCell(null)
+      setFieldJsonEditor({
+        rowKey,
+        column,
+        content: JSON.stringify(value, null, 2),
+      })
+      return
+    }
+
+    setActiveCell({
+      rowKey,
+      column,
+      draftValue: fieldExists && value !== null ? String(value) : '',
+    })
+  }, [])
+
+  const commitCellEdit = useCallback(() => {
+    if (!activeCell) return
+
+    const row = renderedDocs.find((item) => item.rowKey === activeCell.rowKey)
+    if (!row) return
+
+    const fieldExists = hasDocumentField(row.doc, activeCell.column)
+    const result = coerceMongoCellDraft(row.doc[activeCell.column], activeCell.draftValue, fieldExists)
+
+    if (!result.ok) {
+      const messageKey = result.error === 'invalid-number'
+        ? 'mongodb.table.invalidNumber'
+        : result.error === 'invalid-boolean'
+          ? 'mongodb.table.invalidBoolean'
+          : 'mongodb.table.complexInlineEdit'
+      actions.showAlert(t('common.alert.error'), t(messageKey), 'error')
+      return
+    }
+
+    actions.stageDocumentEdit(activeCell.rowKey, {
+      ...row.doc,
+      [activeCell.column]: result.value,
+    })
+    setActiveCell(null)
+  }, [activeCell, actions, renderedDocs, t])
+
+  const handleCellKeyDown = useCallback((event: ReactKeyboardEvent<HTMLInputElement>) => {
+    if (event.key === 'Escape') {
+      event.preventDefault()
+      setActiveCell(null)
+      return
+    }
+
+    if (event.key === 'Enter') {
+      event.preventDefault()
+      commitCellEdit()
+    }
+  }, [commitCellEdit])
+
+  const handleFieldJsonSave = useCallback(async () => {
+    if (!fieldJsonEditor) return
+
+    const row = renderedDocs.find((item) => item.rowKey === fieldJsonEditor.rowKey)
+    if (!row) return
+
+    const result = parseMongoFieldJsonDraft(fieldJsonEditor.content)
+    if (!result.ok) {
+      throw new Error(t('mongodb.fieldJson.invalidJson', { error: result.error }))
+    }
+
+    actions.stageDocumentEdit(fieldJsonEditor.rowKey, {
+      ...row.doc,
+      [fieldJsonEditor.column]: result.value,
+    })
+    setFieldJsonEditor(null)
+  }, [actions, fieldJsonEditor, renderedDocs, t])
+
+  if (renderedDocs.length === 0) {
+    return (
+      <div
+        className="flex flex-1 flex-col items-center justify-center py-12 text-center"
+        data-testid="mongodb.collection.table-empty"
+        data-qa-module="mongodb"
+        data-qa-object="collection-table"
+        data-qa-state="empty"
+      >
+        <FileJson className="mx-auto mb-4 h-12 w-12 text-muted-foreground" />
+        <p className="text-sm text-muted-foreground">{t('mongodb.collection.noDocuments')}</p>
+      </div>
+    )
+  }
+
+  return (
+    <>
+      <div
+        className="flex-1 overflow-auto"
+        data-testid="mongodb.collection.table-scroll"
+        data-qa-module="mongodb"
+        data-qa-object="collection-table"
+        data-qa-state="ready"
+        data-qa-row-count={renderedDocs.length}
+      >
+        <table
+          className="min-w-full border-collapse text-sm"
+          data-testid="mongodb.collection.table"
+          data-qa-module="mongodb"
+          data-qa-object="collection-table"
+          data-qa-state="ready"
+        >
+          <thead className="border-b border-border bg-background">
+            <tr>
+              <th
+                className="sticky left-0 top-0 z-50 w-16 min-w-16 max-w-16 border-b border-r border-border/50 bg-background px-2 py-2 text-center text-xs font-semibold text-muted-foreground"
+              />
+              {state.tableColumns.map((column, index) => (
+                <CollectionViewColumnHeader key={column} column={column} index={index} />
+              ))}
+              <th className="sticky top-0 z-40 w-full border-b border-border/50 bg-background" />
+            </tr>
+          </thead>
+          <tbody className="bg-background">
+            {renderedDocs.map((row, rowIdx) => {
+              const isSelected = state.selectedRowKeys.has(row.rowKey)
+
+              return (
+                <tr
+                  key={row.rowKey}
+                  data-testid="mongodb.collection.table-row"
+                  data-qa-module="mongodb"
+                  data-qa-object="document-row"
+                  data-qa-state={row.isInserted ? 'inserted' : row.isDeleted ? 'deleted' : isSelected ? 'selected' : 'ready'}
+                  data-qa-resource-type="document"
+                  data-qa-resource-id={row.rowKey}
+                  className={cn(
+                    'group transition-colors',
+                    row.isInserted && 'bg-blue-100/20',
+                    row.isDeleted && 'bg-red-100/20',
+                    !row.isInserted && !row.isDeleted && 'hover:bg-muted/50',
+                  )}
+                >
+                  <td
+                    className={cn(
+                      'sticky left-0 z-30 w-16 min-w-16 max-w-16 border-b border-r border-border/50 bg-background px-2 py-2 text-center text-sm font-normal',
+                      row.isInserted && 'bg-blue-100/60',
+                      row.isDeleted && 'bg-red-100/60 text-muted-foreground line-through',
+                      isSelected && 'bg-primary/10',
+                    )}
+                    onClick={() => actions.toggleRowSelection(row.rowKey)}
+                    data-testid="mongodb.collection.table-row-selector"
+                    data-qa-module="mongodb"
+                    data-qa-object="document-row"
+                    data-qa-action="select"
+                    data-qa-state={isSelected ? 'selected' : 'ready'}
+                    data-qa-resource-type="document"
+                    data-qa-resource-id={row.rowKey}
+                  >
+                    {row.rowNumber ?? ''}
+                  </td>
+
+                  {state.tableColumns.map((column) => {
+                    const width = state.columnWidths[column] || 160
+                    const fieldExists = hasDocumentField(row.doc, column)
+                    const value = row.doc[column]
+                    const isComplex = fieldExists && !isMongoScalarValue(value)
+                    const editable = !row.isDeleted && column !== '_id' && !isComplex
+                    const isActive = activeCell?.rowKey === row.rowKey && activeCell.column === column
+                    const changed = row.changeType === 'update' && isMongoCellChanged(row.originalDocument, row.doc, column)
+                    const highlight = findBar?.state.total
+                      ? findBar.state.matches.findIndex((match) => match.rowIndex === rowIdx && match.columnKey === column) === findBar.state.currentMatchIndex
+                        ? 'current'
+                        : findBar.state.matches.some((match) => match.rowIndex === rowIdx && match.columnKey === column)
+                          ? 'match'
+                          : null
+                      : null
+                    const displayValue = !fieldExists
+                      ? t('mongodb.table.unset')
+                      : value === null
+                        ? t('mongodb.table.null')
+                        : isComplex
+                          ? JSON.stringify(value)
+                          : String(value)
+
+                    return (
+                      <td
+                        key={column}
+                        className={cn(
+                          'relative overflow-hidden border-b border-r border-border/50 text-sm text-foreground/80',
+                          isActive ? 'p-0' : 'px-4 py-2',
+                          row.isInserted && 'bg-blue-100/60',
+                          row.isDeleted && 'bg-red-100/60 text-muted-foreground line-through',
+                          changed && 'bg-green-100/60',
+                          isSelected && !row.isInserted && !row.isDeleted && !changed && 'bg-primary/10',
+                          highlight === 'current' && 'bg-blue-200',
+                          highlight === 'match' && 'bg-blue-100/60',
+                          editable && !isActive && 'cursor-default',
+                          isComplex && !row.isDeleted && 'cursor-pointer',
+                        )}
+                        data-testid="mongodb.collection.table-cell"
+                        data-qa-module="mongodb"
+                        data-qa-object="document-cell"
+                        data-qa-field={column}
+                        data-qa-state={isActive ? 'editing' : changed ? 'changed' : row.isInserted ? 'inserted' : row.isDeleted ? 'deleted' : editable ? 'editable' : isComplex ? 'complex' : 'read_only'}
+                        data-qa-disabled-reason={!editable ? row.isDeleted ? 'row_deleted' : column === '_id' ? 'document_id' : isComplex ? 'complex_value' : undefined : undefined}
+                        data-qa-resource-type="document"
+                        data-qa-resource-id={row.rowKey}
+                        data-find-current={highlight === 'current' ? 'true' : undefined}
+                        style={{
+                          minWidth: `${width}px`,
+                          maxWidth: state.resizedColumns.has(column) ? `${width}px` : '320px',
+                        }}
+                        onDoubleClick={() => {
+                          if (row.isDeleted) return
+                          openCellEditor(row.rowKey, column, value, fieldExists)
+                        }}
+                      >
+                        {isActive ? (
+                          <input
+                            autoFocus
+                            type="text"
+                            data-testid="mongodb.collection.table-cell-editor"
+                            data-qa-module="mongodb"
+                            data-qa-object="document-cell"
+                            data-qa-action="edit"
+                            data-qa-field={column}
+                            data-qa-state="editing"
+                            data-qa-resource-type="document"
+                            data-qa-resource-id={row.rowKey}
+                            value={activeCell.draftValue}
+                            onChange={(event) => setActiveCell((current) => current ? { ...current, draftValue: event.target.value } : current)}
+                            onBlur={commitCellEdit}
+                            onKeyDown={handleCellKeyDown}
+                            className="min-h-9 w-full bg-transparent px-4 py-2 text-sm focus:bg-background focus:outline-none focus:ring-2 focus:ring-inset focus:ring-primary"
+                          />
+                        ) : (
+                          <span
+                            className={cn(
+                              'block truncate',
+                              (!fieldExists || value === null) && 'italic text-muted-foreground',
+                              isComplex && 'font-mono text-xs',
+                            )}
+                            title={displayValue}
+                          >
+                            {displayValue}
+                          </span>
+                        )}
+                        <div
+                          data-resize-col={column}
+                          className={cn(
+                            'absolute right-0 top-0 -bottom-px z-20 w-1 cursor-col-resize data-[resize-active]:bg-primary/50',
+                            state.resizingColumn === column && 'bg-primary/50',
+                          )}
+                          onMouseEnter={() => {
+                            if (state.resizingColumn) return
+                            document.querySelectorAll<HTMLElement>(`[data-resize-col="${column}"]`).forEach(element => { element.dataset.resizeActive = '' })
+                          }}
+                          onMouseLeave={() => {
+                            if (state.resizingColumn) return
+                            document.querySelectorAll<HTMLElement>(`[data-resize-col="${column}"]`).forEach(element => { delete element.dataset.resizeActive })
+                          }}
+                          onMouseDown={(event) => actions.handleResizeStart(event, column)}
+                        />
+                      </td>
+                    )
+                  })}
+
+                  <td className="w-full border-b border-border/50 bg-background" />
+                </tr>
+              )
+            })}
+          </tbody>
+        </table>
+      </div>
+
+      {fieldJsonEditor && (
+        <FieldJsonEditorDialog
+          open
+          onOpenChange={(open) => {
+            if (!open) setFieldJsonEditor(null)
+          }}
+          fieldName={fieldJsonEditor.column}
+          content={fieldJsonEditor.content}
+          onContentChange={(content) => setFieldJsonEditor((current) => current ? { ...current, content } : current)}
+          onSave={handleFieldJsonSave}
+        />
+      )}
+    </>
+  )
+}
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx
index bc973aa5a..0a59f70d1 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionView.Toolbar.tsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { Download, Plus, Minus, Undo2, Eye, SendHorizontal, RefreshCw, TerminalSquare, BarChart3 } from 'lucide-react'
+import { Download, Plus, Minus, Undo2, Eye, SendHorizontal, RefreshCw, TerminalSquare, BarChart3, Table2, FileJson } from 'lucide-react'
 import { Separator } from '@/components/ui/separator'
 import { useCollectionView } from './CollectionViewProvider'
 import { DataView } from '@/components/database/shared/DataView'
@@ -17,11 +17,14 @@ interface CollectionViewToolbarProps {
   collectionName: string
 }
 
+/** Toolbar actions for refreshing and mutating MongoDB collection documents. */
 export function CollectionViewToolbar({ connectionId, databaseName, collectionName }: CollectionViewToolbarProps) {
   const { t } = useI18n()
   const { state, actions } = useCollectionView()
   const openTab = useTabStore((s) => s.openTab)
   const [isChartModalOpen, setIsChartModalOpen] = useState(false)
+  const nextViewMode = state.viewMode === 'table' ? 'json' : 'table'
+  const ViewSwitchIcon = nextViewMode === 'table' ? Table2 : FileJson
 
   const handleOpenQuery = () => {
     openTab({
@@ -68,6 +71,28 @@ export function CollectionViewToolbar({ connectionId, databaseName, collectionNa
 
         <Separator orientation="vertical" className="mx-1 data-[orientation=vertical]:h-4" />
 
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={() => actions.setViewMode(nextViewMode)}
+              data-testid="mongodb.collection.view-toggle-button"
+              data-qa-module="mongodb"
+              data-qa-object="collection-view-mode"
+              data-qa-action={nextViewMode === 'table' ? 'switch-to-table' : 'switch-to-json'}
+              data-qa-state={state.viewMode}
+            >
+              <ViewSwitchIcon className="h-4 w-4" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent>
+            {nextViewMode === 'table' ? t('mongodb.view.switchToTable') : t('mongodb.view.switchToJson')}
+          </TooltipContent>
+        </Tooltip>
+
+        <Separator orientation="vertical" className="mx-1 data-[orientation=vertical]:h-4" />
+
         <Tooltip>
           <TooltipTrigger asChild>
             <Button
diff --git a/dataflow/src/components/database/mongodb/CollectionView/CollectionViewProvider.tsx b/dataflow/src/components/database/mongodb/CollectionView/CollectionViewProvider.tsx
index 673087d28..1a7f4f9b2 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/CollectionViewProvider.tsx
+++ b/dataflow/src/components/database/mongodb/CollectionView/CollectionViewProvider.tsx
@@ -1,16 +1,21 @@
-import { createContext, use, useCallback, useEffect, useRef, useState, type ReactNode } from 'react'
+import { createContext, use, useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
 import { useConnectionStore } from '@/stores/useConnectionStore'
 import {
+  SortDirection,
   useGetStorageUnitRowsLazyQuery,
+  useGetColumnsLazyQuery,
   WhereConditionType,
+  type SortCondition,
   type WhereCondition,
 } from '@graphql'
 import { resolveSchemaParam } from '@/utils/database-features'
-import type { CollectionViewContextValue } from './types'
+import type { CollectionViewContextValue, MongoCollectionViewMode, MongoSortDirection } from './types'
 import type { Alert } from '@/components/database/shared/types'
 import type { FlatMongoFilter } from '@/components/database/mongodb/filter-collection.types'
 import { useDocumentChangesetManager } from './useDocumentChangesetManager'
+import { buildMongoTableColumns } from './mongo-table-utils'
 import { useI18n } from '@/i18n/useI18n'
+import { useColumnResize } from '@/components/database/shared/useColumnResize'
 
 const CollectionViewCtx = createContext<CollectionViewContextValue | null>(null)
 
@@ -35,16 +40,24 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
 
   // ---- GraphQL hooks ----
   const [getRows] = useGetStorageUnitRowsLazyQuery({ fetchPolicy: 'no-cache' })
+  const [getColumns] = useGetColumnsLazyQuery({ fetchPolicy: 'no-cache' })
 
   // ---- Core state ----
   const [loading, setLoading] = useState(true)
   const [documents, setDocuments] = useState<any[]>([])
   const [error, setError] = useState<string | null>(null)
+  const [viewMode, setViewModeState] = useState<MongoCollectionViewMode>('table')
   const [currentPage, setCurrentPage] = useState(1)
   const [total, setTotal] = useState(0)
   const [pageSize, setPageSize] = useState(50)
-  const [searchTerm, setSearchTerm] = useState('')
   const [refreshKey, setRefreshKey] = useState(0)
+  const [sampledFields, setSampledFields] = useState<string[]>([])
+  const [hasSampledFields, setHasSampledFields] = useState(false)
+
+  // ---- Sorting state ----
+  const [sortColumn, setSortColumn] = useState<string | null>(null)
+  const [sortDirection, setSortDirection] = useState<MongoSortDirection | null>(null)
+  const [activeColumnMenu, setActiveColumnMenu] = useState<string | null>(null)
 
   // ---- Export state ----
   const [showExportModal, setShowExportModal] = useState(false)
@@ -52,7 +65,7 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
   // ---- Filter state ----
   const [isFilterModalOpen, setIsFilterModalOpen] = useState(false)
   const [activeFilter, setActiveFilter] = useState<FlatMongoFilter>({})
-  const [availableFields, setAvailableFields] = useState<string[]>([])
+  const [preferredFilterField, setPreferredFilterField] = useState<string | null>(null)
 
   // ---- Alert state ----
   const [alert, setAlert] = useState<Alert | null>(null)
@@ -101,6 +114,51 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     pendingReloadActionRef.current = null
   }, [changesetActions])
 
+  const setViewMode = useCallback((mode: MongoCollectionViewMode) => {
+    setViewModeState(mode)
+  }, [])
+
+  const sampleCollectionFields = useCallback(async () => {
+    const conn = connections.find(c => c.id === connectionId)
+    if (!conn) return
+
+    const graphqlSchema = resolveSchemaParam(conn.type, databaseName)
+    const { data: result, error: queryError } = await getColumns({
+      variables: {
+        schema: graphqlSchema,
+        storageUnit: collectionName,
+      },
+      context: { database: databaseName },
+    })
+
+    if (queryError) {
+      setError(queryError.message)
+      setHasSampledFields(true)
+      return
+    }
+
+    setSampledFields(result?.Columns.map((column) => column.Name) ?? [])
+    setHasSampledFields(true)
+  }, [collectionName, connectionId, connections, databaseName, getColumns])
+
+  useEffect(() => {
+    setViewModeState('table')
+    setCurrentPage(1)
+    setSortColumn(null)
+    setSortDirection(null)
+    setActiveColumnMenu(null)
+    setActiveFilter({})
+    setPreferredFilterField(null)
+    setSampledFields([])
+    setHasSampledFields(false)
+    changesetActions.discardChanges()
+  }, [changesetActions.discardChanges, collectionName, connectionId, databaseName])
+
+  useEffect(() => {
+    if (viewMode !== 'table' || hasSampledFields) return
+    void sampleCollectionFields()
+  }, [hasSampledFields, sampleCollectionFields, viewMode])
+
   // ---- beforeunload guard ----
   useEffect(() => {
     if (!changesetState.hasPendingChanges) return
@@ -114,26 +172,17 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     return () => window.removeEventListener('beforeunload', handleBeforeUnload)
   }, [changesetState.hasPendingChanges])
 
-  // ---- Extract available fields from documents ----
-  useEffect(() => {
-    if (documents.length > 0) {
-      const keys = new Set<string>()
-      documents.slice(0, 50).forEach(doc => {
-        if (typeof doc === 'object' && doc !== null) {
-          Object.keys(doc).forEach(k => keys.add(k))
-        }
-      })
-      setAvailableFields(Array.from(keys).sort())
-    }
-  }, [documents])
+  const tableColumns = useMemo(() => buildMongoTableColumns({
+    sampledFields,
+    documents: documents as Record<string, unknown>[],
+    changes: changesetState.changes,
+  }), [changesetState.changes, documents, sampledFields])
+  const { columnWidths, resizingColumn, resizedColumns, handleResizeStart } = useColumnResize(tableColumns, {
+    initialWidth: 160,
+    minimumWidth: 80,
+  })
 
-  // ---- Guarded search term setter (resets to page 1) ----
-  const setSearchTermGuarded = useCallback((term: string) => {
-    runWithDiscardGuard(() => {
-      setSearchTerm(term)
-      setCurrentPage(1)
-    })
-  }, [runWithDiscardGuard])
+  const availableFields = tableColumns
 
   // ---- Main data fetch ----
   useEffect(() => {
@@ -178,19 +227,6 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
         }
       }
 
-      // Add search term as regex on 'document' column if present
-      if (searchTerm.trim()) {
-        filterConditions.push({
-          Type: WhereConditionType.Atomic,
-          Atomic: {
-            Key: 'document',
-            Operator: 'regex',
-            Value: searchTerm.trim(),
-            ColumnType: 'string',
-          },
-        })
-      }
-
       let where: WhereCondition | undefined
       if (filterConditions.length === 1) {
         where = filterConditions[0]
@@ -198,12 +234,18 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
         where = { Type: WhereConditionType.And, And: { Children: filterConditions } }
       }
 
+      const sort: SortCondition[] | undefined =
+        sortColumn && sortDirection
+          ? [{ Column: sortColumn, Direction: sortDirection === 'asc' ? SortDirection.Asc : SortDirection.Desc }]
+          : undefined
+
       try {
         const { data: result, error: queryError } = await getRows({
           variables: {
             schema: graphqlSchema,
             storageUnit: collectionName,
             where,
+            sort,
             pageSize,
             pageOffset: (currentPage - 1) * pageSize,
           },
@@ -234,7 +276,7 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     }
 
     fetchData()
-  }, [connectionId, databaseName, collectionName, connections, collectionRefreshKey, currentPage, pageSize, searchTerm, activeFilter, refreshKey, getRows, t])
+  }, [connectionId, databaseName, collectionName, connections, collectionRefreshKey, currentPage, pageSize, activeFilter, refreshKey, sortColumn, sortDirection, getRows, t])
 
   // ---- Page change ----
   const handlePageChange = useCallback((page: number) => {
@@ -246,9 +288,43 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     runWithDiscardGuard(() => { setPageSize(size); setCurrentPage(1) })
   }, [runWithDiscardGuard])
 
+  // ---- Sorting ----
+  const handleSort = useCallback((column: string, direction: MongoSortDirection) => {
+    runWithDiscardGuard(() => {
+      setSortColumn(column)
+      setSortDirection(direction)
+      setActiveColumnMenu(null)
+      setCurrentPage(1)
+    })
+  }, [runWithDiscardGuard])
+
+  const clearSort = useCallback(() => {
+    runWithDiscardGuard(() => {
+      setSortColumn(null)
+      setSortDirection(null)
+      setActiveColumnMenu(null)
+      setCurrentPage(1)
+    })
+  }, [runWithDiscardGuard])
+
+  const setFilterModalOpen = useCallback((open: boolean) => {
+    setIsFilterModalOpen(open)
+    if (!open) setPreferredFilterField(null)
+  }, [])
+
+  const openFilterForField = useCallback((field: string) => {
+    setPreferredFilterField(field)
+    setActiveColumnMenu(null)
+    setIsFilterModalOpen(true)
+  }, [])
+
   // ---- Filter apply ----
   const handleFilterApply = useCallback((filter: FlatMongoFilter) => {
-    runWithDiscardGuard(() => { setActiveFilter(filter); setCurrentPage(1) })
+    runWithDiscardGuard(() => {
+      setActiveFilter(filter)
+      setPreferredFilterField(null)
+      setCurrentPage(1)
+    })
   }, [runWithDiscardGuard])
 
   // ---- Derived values ----
@@ -258,16 +334,24 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     loading,
     documents,
     error,
+    viewMode,
+    tableColumns,
     currentPage,
     pageSize,
     total,
     totalPages,
-    searchTerm,
+    sortColumn,
+    sortDirection,
+    activeColumnMenu,
     activeFilter,
     availableFields,
+    preferredFilterField,
     showExportModal,
     isFilterModalOpen,
     alert,
+    columnWidths,
+    resizingColumn,
+    resizedColumns,
     ...changesetState,
   }
 
@@ -275,10 +359,15 @@ export function CollectionViewProvider({ connectionId, databaseName, collectionN
     refresh: () => runWithDiscardGuard(refresh),
     handlePageChange,
     handlePageSizeChange,
-    setSearchTerm: setSearchTermGuarded,
-    setIsFilterModalOpen,
+    setViewMode,
+    handleSort,
+    clearSort,
+    setActiveColumnMenu,
+    setIsFilterModalOpen: setFilterModalOpen,
+    openFilterForField,
     handleFilterApply,
     setShowExportModal,
+    handleResizeStart,
     showAlert,
     closeAlert,
     confirmDiscardAndContinue,
diff --git a/dataflow/src/components/database/mongodb/CollectionView/mongo-table-utils.ts b/dataflow/src/components/database/mongodb/CollectionView/mongo-table-utils.ts
new file mode 100644
index 000000000..6f2508784
--- /dev/null
+++ b/dataflow/src/components/database/mongodb/CollectionView/mongo-table-utils.ts
@@ -0,0 +1,185 @@
+import type {
+  DocumentChange,
+  DocumentChangesetRowKey,
+  RenderedMongoDocument,
+} from './types'
+import { buildExistingRowKey } from './useDocumentChangesetManager'
+
+export type MongoScalarValue = string | number | boolean | null
+export type MongoComplexValue = Record<string, unknown> | unknown[]
+export type MongoCellValue = MongoScalarValue | MongoComplexValue
+export type MongoCellCoercionError = 'invalid-number' | 'invalid-boolean' | 'complex-value'
+
+export type MongoCellCoercionResult =
+  | { ok: true; value: MongoCellValue }
+  | { ok: false; error: MongoCellCoercionError }
+
+export type MongoFieldJsonParseResult =
+  | { ok: true; value: unknown }
+  | { ok: false; error: string }
+
+/** Returns whether a value can be edited directly in a MongoDB table cell. */
+export function isMongoScalarValue(value: unknown): value is MongoScalarValue {
+  return value === null || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean'
+}
+
+function parseMongoJsonObjectOrArrayDraft(draftValue: string): MongoComplexValue | null {
+  const trimmedDraft = draftValue.trim()
+  if (!trimmedDraft) return null
+
+  try {
+    const value = JSON.parse(trimmedDraft) as unknown
+    if (Array.isArray(value)) return value
+    if (value !== null && typeof value === 'object') return value as Record<string, unknown>
+  } catch {
+    return null
+  }
+
+  return null
+}
+
+function parseMongoQuotedComplexLiteralDraft(draftValue: string): string | null {
+  const trimmedDraft = draftValue.trim()
+  if (!trimmedDraft) return null
+
+  try {
+    const value = JSON.parse(trimmedDraft) as unknown
+    if (typeof value !== 'string') return null
+    return parseMongoJsonObjectOrArrayDraft(value) ? value : null
+  } catch {
+    return null
+  }
+}
+
+/** Returns whether a document owns the requested top-level field. */
+export function hasDocumentField(doc: Record<string, unknown>, field: string): boolean {
+  return Object.prototype.hasOwnProperty.call(doc, field)
+}
+
+/** Builds the document rows that should be rendered after applying pending changes. */
+export function buildRenderedMongoDocuments({
+  documents,
+  changes,
+  newRowOrder,
+  pageOffset,
+}: {
+  documents: Record<string, unknown>[]
+  changes: Map<DocumentChangesetRowKey, DocumentChange>
+  newRowOrder: DocumentChangesetRowKey[]
+  pageOffset: number
+}): RenderedMongoDocument[] {
+  const inserted = newRowOrder
+    .map((rowKey): RenderedMongoDocument | null => {
+      const change = changes.get(rowKey)
+      if (!change) return null
+
+      return {
+        rowKey,
+        doc: change.document,
+        originalDocument: change.originalDocument,
+        changeType: change.type,
+        isDeleted: false,
+        isInserted: true,
+        rowNumber: null,
+      }
+    })
+    .filter((item): item is RenderedMongoDocument => item !== null)
+
+  const existing = documents.map((doc, idx): RenderedMongoDocument => {
+    const rowKey = buildExistingRowKey(pageOffset, idx)
+    const change = changes.get(rowKey)
+    return {
+      rowKey,
+      doc: change?.document ?? doc,
+      originalDocument: change?.originalDocument ?? doc,
+      changeType: change?.type ?? null,
+      isDeleted: change?.type === 'delete',
+      isInserted: false,
+      rowNumber: pageOffset + idx + 1,
+    }
+  })
+
+  return [...inserted, ...existing]
+}
+
+/** Builds the table column order from sampled fields, current documents, and pending changes. */
+export function buildMongoTableColumns({
+  sampledFields,
+  documents,
+  changes,
+}: {
+  sampledFields: string[]
+  documents: Record<string, unknown>[]
+  changes: Map<DocumentChangesetRowKey, DocumentChange>
+}): string[] {
+  const fields = new Set<string>(['_id', ...sampledFields])
+
+  for (const doc of documents) {
+    Object.keys(doc).forEach((field) => fields.add(field))
+  }
+
+  for (const change of changes.values()) {
+    Object.keys(change.document).forEach((field) => fields.add(field))
+  }
+
+  const sorted = [...fields].filter((field) => field !== '_id').sort((left, right) => left.localeCompare(right))
+  return ['_id', ...sorted]
+}
+
+/** Returns whether a rendered table cell differs from its original document value. */
+export function isMongoCellChanged(
+  originalDocument: Record<string, unknown>,
+  document: Record<string, unknown>,
+  field: string,
+): boolean {
+  const originalHasField = hasDocumentField(originalDocument, field)
+  const nextHasField = hasDocumentField(document, field)
+  if (originalHasField !== nextHasField) return true
+  return !Object.is(originalDocument[field], document[field])
+}
+
+/** Converts an edited cell draft back to the correct MongoDB scalar value. */
+export function coerceMongoCellDraft(
+  existingValue: unknown,
+  draftValue: string,
+  fieldExists: boolean,
+): MongoCellCoercionResult {
+  const complexValue = parseMongoJsonObjectOrArrayDraft(draftValue)
+  if (complexValue !== null) return { ok: true, value: complexValue }
+
+  if (!fieldExists || existingValue === null) {
+    const complexLiteral = parseMongoQuotedComplexLiteralDraft(draftValue)
+    if (complexLiteral !== null) return { ok: true, value: complexLiteral }
+    return { ok: true, value: draftValue }
+  }
+
+  if (typeof existingValue === 'string') {
+    const complexLiteral = parseMongoQuotedComplexLiteralDraft(draftValue)
+    if (complexLiteral !== null) return { ok: true, value: complexLiteral }
+    return { ok: true, value: draftValue }
+  }
+
+  if (typeof existingValue === 'number') {
+    const nextValue = Number(draftValue)
+    if (Number.isNaN(nextValue)) return { ok: false, error: 'invalid-number' }
+    return { ok: true, value: nextValue }
+  }
+
+  if (typeof existingValue === 'boolean') {
+    const normalized = draftValue.trim().toLowerCase()
+    if (normalized === 'true') return { ok: true, value: true }
+    if (normalized === 'false') return { ok: true, value: false }
+    return { ok: false, error: 'invalid-boolean' }
+  }
+
+  return { ok: false, error: 'complex-value' }
+}
+
+/** Parses a field-level JSON editor draft into a MongoDB field value. */
+export function parseMongoFieldJsonDraft(content: string): MongoFieldJsonParseResult {
+  try {
+    return { ok: true, value: JSON.parse(content) }
+  } catch (error) {
+    return { ok: false, error: error instanceof Error ? error.message : String(error) }
+  }
+}
diff --git a/dataflow/src/components/database/mongodb/CollectionView/types.ts b/dataflow/src/components/database/mongodb/CollectionView/types.ts
index f7c3dce3e..9594d0fcc 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/types.ts
+++ b/dataflow/src/components/database/mongodb/CollectionView/types.ts
@@ -1,6 +1,10 @@
+import type { MouseEvent as ReactMouseEvent } from 'react'
 import type { Alert } from '@/components/database/shared/types'
 import type { FlatMongoFilter } from '@/components/database/mongodb/filter-collection.types'
 
+export type MongoCollectionViewMode = 'table' | 'json'
+export type MongoSortDirection = 'asc' | 'desc'
+
 // ---- Document changeset types ----
 
 export type DocumentChangesetRowKey = string
@@ -30,6 +34,16 @@ export interface DocumentUndoEntryDelete {
 
 export type DocumentUndoEntry = DocumentUndoEntryEdit | DocumentUndoEntryAdd | DocumentUndoEntryDelete
 
+export interface RenderedMongoDocument {
+  rowKey: DocumentChangesetRowKey
+  doc: Record<string, unknown>
+  originalDocument: Record<string, unknown>
+  changeType: DocumentChange['type'] | null
+  isDeleted: boolean
+  isInserted: boolean
+  rowNumber: number | null
+}
+
 /** Context value exposed by CollectionViewProvider. */
 export interface CollectionViewContextValue {
   state: CollectionViewState
@@ -41,16 +55,24 @@ export interface CollectionViewState {
   loading: boolean
   documents: any[]
   error: string | null
+  viewMode: MongoCollectionViewMode
+  tableColumns: string[]
   currentPage: number
   pageSize: number
   total: number
   totalPages: number
-  searchTerm: string
+  sortColumn: string | null
+  sortDirection: MongoSortDirection | null
+  activeColumnMenu: string | null
   activeFilter: FlatMongoFilter
   availableFields: string[]
+  preferredFilterField: string | null
   showExportModal: boolean
   isFilterModalOpen: boolean
   alert: Alert | null
+  columnWidths: Record<string, number>
+  resizingColumn: string | null
+  resizedColumns: Set<string>
 
   // Changeset state
   changes: Map<DocumentChangesetRowKey, DocumentChange>
@@ -75,10 +97,15 @@ export interface CollectionViewActions {
   refresh: () => void
   handlePageChange: (page: number) => void
   handlePageSizeChange: (size: number) => void
-  setSearchTerm: (term: string) => void
+  setViewMode: (mode: MongoCollectionViewMode) => void
+  handleSort: (column: string, direction: MongoSortDirection) => void
+  clearSort: () => void
+  setActiveColumnMenu: (column: string | null) => void
   setIsFilterModalOpen: (open: boolean) => void
+  openFilterForField: (field: string) => void
   handleFilterApply: (filter: FlatMongoFilter) => void
   setShowExportModal: (open: boolean) => void
+  handleResizeStart: (event: ReactMouseEvent, column: string) => void
   showAlert: (title: string, message: string, type: Alert['type']) => void
   closeAlert: () => void
 
@@ -87,6 +114,7 @@ export interface CollectionViewActions {
   markSelectedForDelete: () => void
   undoLastChange: () => void
   discardChanges: () => void
+  stageDocumentEdit: (rowKey: DocumentChangesetRowKey, document: Record<string, unknown>) => void
   submitChanges: () => Promise<void>
   setShowPreviewModal: (open: boolean) => void
   setShowSubmitModal: (open: boolean) => void
diff --git a/dataflow/src/components/database/mongodb/CollectionView/useDocumentChangesetManager.ts b/dataflow/src/components/database/mongodb/CollectionView/useDocumentChangesetManager.ts
index 052abea1d..00cb6207c 100644
--- a/dataflow/src/components/database/mongodb/CollectionView/useDocumentChangesetManager.ts
+++ b/dataflow/src/components/database/mongodb/CollectionView/useDocumentChangesetManager.ts
@@ -297,7 +297,11 @@ function changesetReducer(state: ChangesetState, action: ChangesetAction): Chang
       return { ...state, showAddModal: false }
 
     case 'open-edit-modal':
-      return { ...state, editingRowKey: action.rowKey, editContent: action.content }
+      return {
+        ...state,
+        editingRowKey: action.rowKey,
+        editContent: action.content,
+      }
 
     case 'set-edit-content':
       return { ...state, editContent: action.content }
@@ -391,29 +395,51 @@ export function useDocumentChangesetManager({
 
   // ---- Edit document ----
 
-  const handleEditClick = useCallback((rowKey: DocumentChangesetRowKey) => {
+  const resolveDocumentForEdit = useCallback((rowKey: DocumentChangesetRowKey) => {
     const change = state.changes.get(rowKey)
-    let doc: Record<string, unknown> | undefined
+
+    if (change?.type === 'insert') {
+      return {
+        originalDocument: {},
+        currentDocument: change.document,
+        isInsert: true,
+      }
+    }
 
     if (change) {
-      doc = change.type === 'delete' ? change.originalDocument : change.document
-    } else {
-      const match = rowKey.match(/^existing-(\d+)$/)
-      if (match) {
-        const globalIndex = parseInt(match[1], 10)
-        const localIndex = globalIndex - pageOffset
-        if (localIndex >= 0 && localIndex < documents.length) {
-          doc = documents[localIndex]
-        }
+      return {
+        originalDocument: change.originalDocument,
+        currentDocument: change.type === 'delete' ? change.originalDocument : change.document,
+        isInsert: false,
       }
     }
 
-    if (!doc) return
+    const match = rowKey.match(/^existing-(\d+)$/)
+    if (!match) return null
+
+    const localIndex = parseInt(match[1], 10) - pageOffset
+    const document = documents[localIndex]
+    if (!document) return null
 
-    const { _id: _, ...rest } = doc
-    dispatch({ type: 'open-edit-modal', rowKey, content: JSON.stringify(rest, null, 2) })
+    return {
+      originalDocument: document,
+      currentDocument: document,
+      isInsert: false,
+    }
   }, [documents, pageOffset, state.changes])
 
+  const handleEditClick = useCallback((rowKey: DocumentChangesetRowKey) => {
+    const resolved = resolveDocumentForEdit(rowKey)
+    if (!resolved) return
+
+    const { _id: _, ...rest } = resolved.currentDocument
+    dispatch({
+      type: 'open-edit-modal',
+      rowKey,
+      content: JSON.stringify(rest, null, 2),
+    })
+  }, [resolveDocumentForEdit])
+
   const setEditContent = useCallback((content: string) => {
     dispatch({ type: 'set-edit-content', content })
   }, [])
@@ -423,36 +449,37 @@ export function useDocumentChangesetManager({
 
     try {
       const parsed = parseMongoDocumentInput(state.editContent)
-      const change = state.changes.get(state.editingRowKey)
-      const isInsert = change?.type === 'insert'
-
-      let originalDocument: Record<string, unknown>
-      if (isInsert) {
-        originalDocument = {}
-      } else if (change) {
-        originalDocument = change.originalDocument
-      } else {
-        const match = state.editingRowKey.match(/^existing-(\d+)$/)
-        if (!match) return
-        const localIndex = parseInt(match[1], 10) - pageOffset
-        originalDocument = documents[localIndex]
-      }
+      const resolved = resolveDocumentForEdit(state.editingRowKey)
+      if (!resolved) return
 
       // Preserve _id from original document
-      const { _id } = isInsert ? change!.document : originalDocument
+      const { _id } = resolved.currentDocument
       const document = _id !== undefined ? { ...parsed, _id } : parsed
 
       dispatch({
         type: 'stage-edit',
         rowKey: state.editingRowKey,
-        originalDocument,
+        originalDocument: resolved.originalDocument,
         document,
-        isInsert,
+        isInsert: resolved.isInsert,
       })
     } catch (e: any) {
       showAlert(t('common.alert.error'), t('mongodb.alert.invalidJsonUpdate', { error: e.message }), 'error')
     }
-  }, [documents, pageOffset, showAlert, state.changes, state.editContent, state.editingRowKey, t])
+  }, [resolveDocumentForEdit, showAlert, state.editContent, state.editingRowKey, t])
+
+  const stageDocumentEdit = useCallback((rowKey: DocumentChangesetRowKey, document: Record<string, unknown>) => {
+    const resolved = resolveDocumentForEdit(rowKey)
+    if (!resolved) return
+
+    dispatch({
+      type: 'stage-edit',
+      rowKey,
+      originalDocument: resolved.originalDocument,
+      document,
+      isInsert: resolved.isInsert,
+    })
+  }, [resolveDocumentForEdit])
 
   const cancelEdit = useCallback(() => {
     dispatch({ type: 'close-edit-modal' })
@@ -622,6 +649,7 @@ export function useDocumentChangesetManager({
       markSelectedForDelete,
       undoLastChange,
       discardChanges,
+      stageDocumentEdit,
       submitChanges,
       setShowPreviewModal,
       setShowSubmitModal,
diff --git a/dataflow/src/components/database/mongodb/FilterCollectionModal.tsx b/dataflow/src/components/database/mongodb/FilterCollectionModal.tsx
index 7ed2ffa33..5e9b5d5b0 100644
--- a/dataflow/src/components/database/mongodb/FilterCollectionModal.tsx
+++ b/dataflow/src/components/database/mongodb/FilterCollectionModal.tsx
@@ -25,6 +25,7 @@ interface FilterCollectionModalProps {
   onOpenChange: (open: boolean) => void
   onApply: (filter: FlatMongoFilter) => void
   fields: string[]
+  preferredField?: string | null
   initialFilter?: FlatMongoFilter
 }
 
@@ -49,6 +50,7 @@ export function FilterCollectionModal({
   onOpenChange,
   onApply,
   fields,
+  preferredField,
   initialFilter,
 }: FilterCollectionModalProps) {
   return (
@@ -57,6 +59,7 @@ export function FilterCollectionModal({
         <FilterCollectionProvider
           open={open}
           fields={fields}
+          preferredField={preferredField}
           initialFilter={initialFilter}
           onApply={onApply}
           onOpenChange={onOpenChange}
diff --git a/dataflow/src/components/database/mongodb/FilterCollectionProvider.tsx b/dataflow/src/components/database/mongodb/FilterCollectionProvider.tsx
index 5d9d37cff..e36394f89 100644
--- a/dataflow/src/components/database/mongodb/FilterCollectionProvider.tsx
+++ b/dataflow/src/components/database/mongodb/FilterCollectionProvider.tsx
@@ -262,6 +262,7 @@ function buildFlatFilter(conditions: FilterConditionDraft[]): FlatMongoFilter {
 interface FilterCollectionProviderProps {
   open: boolean
   fields: string[]
+  preferredField?: string | null
   initialFilter?: FlatMongoFilter
   onApply: (filter: FlatMongoFilter) => void
   onOpenChange: (open: boolean) => void
@@ -310,6 +311,7 @@ function AlertBridge({
 export function FilterCollectionProvider({
   open,
   fields,
+  preferredField,
   initialFilter,
   onApply,
   onOpenChange,
@@ -331,8 +333,17 @@ export function FilterCollectionProvider({
 
     if (open && !wasOpen) {
       const parsed = parseInitialFilter(initialFilter)
-      if (parsed.conditions.length > 0) {
-        setConditions(parsed.conditions)
+      const nextConditions = [...parsed.conditions]
+      if (
+        preferredField &&
+        fields.includes(preferredField) &&
+        !nextConditions.some((condition) => getNormalizedField(condition.field) === preferredField)
+      ) {
+        nextConditions.push(createConditionForField(preferredField))
+      }
+
+      if (nextConditions.length > 0) {
+        setConditions(nextConditions)
       } else {
         setConditions([createEmptyCondition(fields)])
       }
@@ -347,7 +358,7 @@ export function FilterCollectionProvider({
     }
 
     wasOpenRef.current = open
-  }, [open, initialFilter, fields, pushAlert, t])
+  }, [open, initialFilter, fields, preferredField, pushAlert, t])
 
   const addCondition = useCallback(() => {
     const nextField = findFirstUnusedField(fields, conditions) ?? fields[0] ?? null
diff --git a/dataflow/src/components/database/shared/FindBar.Provider.tsx b/dataflow/src/components/database/shared/FindBar.Provider.tsx
index 9bf038b6b..252347c8a 100644
--- a/dataflow/src/components/database/shared/FindBar.Provider.tsx
+++ b/dataflow/src/components/database/shared/FindBar.Provider.tsx
@@ -47,10 +47,6 @@ interface FindBarProviderProps {
   rows: Record<string, unknown>[] | undefined
   /** Column keys to search. */
   columns: string[] | undefined
-  /** Optional controlled search term. */
-  searchTerm?: string
-  /** Optional controlled setter for integrating external search state. */
-  onSearchTermChange?: (term: string) => void
   children: ReactNode
 }
 
@@ -58,23 +54,11 @@ interface FindBarProviderProps {
 export function FindBarProvider({
   rows,
   columns,
-  searchTerm: controlledSearchTerm,
-  onSearchTermChange,
   children,
 }: FindBarProviderProps) {
-  const [internalSearchTerm, setInternalSearchTerm] = useState('')
+  const [searchTerm, setSearchTerm] = useState('')
   const [currentMatchIndex, setCurrentMatchIndex] = useState(0)
   const inputRef = useRef<HTMLInputElement | null>(null)
-  const searchTerm = controlledSearchTerm ?? internalSearchTerm
-
-  const setSearchTerm = useCallback((term: string) => {
-    if (onSearchTermChange) {
-      onSearchTermChange(term)
-      return
-    }
-
-    setInternalSearchTerm(term)
-  }, [onSearchTermChange])
 
   const matches = useMemo<FindMatch[]>(() => {
     if (!searchTerm.trim() || !rows || !columns) return []
diff --git a/dataflow/src/components/database/sql/TableView/useColumnResize.ts b/dataflow/src/components/database/shared/useColumnResize.ts
similarity index 54%
rename from dataflow/src/components/database/sql/TableView/useColumnResize.ts
rename to dataflow/src/components/database/shared/useColumnResize.ts
index 591aa9e4a..458fe0d50 100644
--- a/dataflow/src/components/database/sql/TableView/useColumnResize.ts
+++ b/dataflow/src/components/database/shared/useColumnResize.ts
@@ -1,56 +1,68 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, type MouseEvent as ReactMouseEvent } from 'react'
+
+interface ColumnResizeOptions {
+  initialWidth?: number
+  minimumWidth?: number
+}
 
 /**
  * Manages column resize state and document-level mouse event listeners for drag resizing.
  * Returns current column widths and a handler to initiate resizing on mousedown.
  */
-export function useColumnResize(columns: string[] | undefined): {
+export function useColumnResize(
+  columns: string[] | undefined,
+  { initialWidth = 120, minimumWidth = 60 }: ColumnResizeOptions = {},
+): {
   columnWidths: Record<string, number>
   resizingColumn: string | null
   resizedColumns: Set<string>
-  handleResizeStart: (e: React.MouseEvent, column: string) => void
+  handleResizeStart: (event: ReactMouseEvent, column: string) => void
 } {
   const [columnWidths, setColumnWidths] = useState<Record<string, number>>({})
   const [resizingColumn, setResizingColumn] = useState<string | null>(null)
   const [resizedColumns, setResizedColumns] = useState<Set<string>>(new Set())
   const resizingRef = useRef<{ column: string; startX: number; startWidth: number } | null>(null)
 
-  // Initialize widths when columns first arrive
+  const getInitialWidth = useCallback((column: string) => {
+    return Math.max(initialWidth, column.length * 10 + 60)
+  }, [initialWidth])
+
+  // Initialize widths when columns first arrive.
   useEffect(() => {
-    if (columns && Object.keys(columnWidths).length === 0) {
+    if (columns && columns.length > 0 && Object.keys(columnWidths).length === 0) {
       const initialWidths: Record<string, number> = {}
-      columns.forEach((col) => {
-        initialWidths[col] = Math.max(120, col.length * 10 + 60)
+      columns.forEach((column) => {
+        initialWidths[column] = getInitialWidth(column)
       })
       setColumnWidths(initialWidths)
     }
-  }, [columns])
+  }, [columnWidths, columns, getInitialWidth])
 
-  // Document-level mousemove/mouseup for drag resizing
+  // Document-level mousemove/mouseup for drag resizing.
   useEffect(() => {
-    const handleMouseMove = (e: MouseEvent) => {
+    const handleMouseMove = (event: MouseEvent) => {
       if (resizingRef.current) {
         const { column, startX, startWidth } = resizingRef.current
-        const diff = e.clientX - startX
-        const newWidth = Math.max(60, startWidth + diff)
+        const diff = event.clientX - startX
+        const newWidth = Math.max(minimumWidth, startWidth + diff)
         setColumnWidths(prev => ({ ...prev, [column]: newWidth }))
       }
     }
 
     const handleMouseUp = () => {
       if (resizingRef.current) {
-        const col = resizingRef.current.column
+        const column = resizingRef.current.column
         setResizedColumns(prev => {
-          if (prev.has(col)) return prev
+          if (prev.has(column)) return prev
           const next = new Set(prev)
-          next.add(col)
+          next.add(column)
           return next
         })
         resizingRef.current = null
         setResizingColumn(null)
         document.body.style.cursor = 'default'
-        document.querySelectorAll<HTMLElement>('[data-resize-active]').forEach(el => {
-          delete el.dataset.resizeActive
+        document.querySelectorAll<HTMLElement>('[data-resize-active]').forEach(element => {
+          delete element.dataset.resizeActive
         })
       }
     }
@@ -61,19 +73,19 @@ export function useColumnResize(columns: string[] | undefined): {
       document.removeEventListener('mousemove', handleMouseMove)
       document.removeEventListener('mouseup', handleMouseUp)
     }
-  }, [])
+  }, [minimumWidth])
 
-  const handleResizeStart = useCallback((e: React.MouseEvent, column: string) => {
-    e.preventDefault()
-    e.stopPropagation()
+  const handleResizeStart = useCallback((event: ReactMouseEvent, column: string) => {
+    event.preventDefault()
+    event.stopPropagation()
     resizingRef.current = {
       column,
-      startX: e.clientX,
-      startWidth: columnWidths[column] || 120,
+      startX: event.clientX,
+      startWidth: columnWidths[column] || getInitialWidth(column),
     }
     setResizingColumn(column)
     document.body.style.cursor = 'col-resize'
-  }, [columnWidths])
+  }, [columnWidths, getInitialWidth])
 
   return { columnWidths, resizingColumn, resizedColumns, handleResizeStart }
 }
diff --git a/dataflow/src/components/database/sql/TableView/TableViewProvider.tsx b/dataflow/src/components/database/sql/TableView/TableViewProvider.tsx
index 2af14e53c..331158776 100644
--- a/dataflow/src/components/database/sql/TableView/TableViewProvider.tsx
+++ b/dataflow/src/components/database/sql/TableView/TableViewProvider.tsx
@@ -1,7 +1,7 @@
 import { createContext, use, useCallback, useEffect, useRef, useState, type ReactNode } from 'react'
 import { useChangesetManager } from './useChangesetManager'
 import { useDataQuery } from './useDataQuery'
-import { useColumnResize } from './useColumnResize'
+import { useColumnResize } from '@/components/database/shared/useColumnResize'
 import type { TableViewContextValue, TableViewState, TableViewActions, FilterCondition } from './types'
 import type { Alert } from '@/components/database/shared/types'
 
@@ -37,7 +37,6 @@ interface TableViewProviderProps {
 /** Provider that owns all TableDetailView state, GraphQL operations, and handlers. */
 export function TableViewProvider({ connectionId, databaseName, tableName, schema, children }: TableViewProviderProps) {
   // ---- UI state ----
-  const [searchTerm, setSearchTerm] = useState('')
   const [currentPage, setCurrentPage] = useState(1)
   const [pageSize, setPageSize] = useState(50)
 
@@ -73,7 +72,6 @@ export function TableViewProvider({ connectionId, databaseName, tableName, schem
     tableName,
     currentPage,
     pageSize,
-    searchTerm,
     sortColumn,
     sortDirection,
     filterConditions,
@@ -135,7 +133,6 @@ export function TableViewProvider({ connectionId, databaseName, tableName, schem
       setFilterConditions([])
       setSortColumn(null)
       setSortDirection(null)
-      setSearchTerm('')
       setCurrentPage(1)
       changesetActions.discardChanges()
     }
@@ -153,14 +150,6 @@ export function TableViewProvider({ connectionId, databaseName, tableName, schem
     return () => window.removeEventListener('beforeunload', handleBeforeUnload)
   }, [changesetState.hasPendingChanges])
 
-  // ---- Search submit (reset to page 1) ----
-  const handleSearchSubmit = useCallback(() => {
-    runWithDiscardGuard(() => {
-      setCurrentPage(1)
-      queryActions.handleSubmitRequest(0)
-    })
-  }, [queryActions.handleSubmitRequest, runWithDiscardGuard])
-
   // ---- Sorting ----
   const handleSort = useCallback((column: string, direction: 'asc' | 'desc') => {
     runWithDiscardGuard(() => {
@@ -207,7 +196,6 @@ export function TableViewProvider({ connectionId, databaseName, tableName, schem
     ...queryState,
     currentPage,
     pageSize,
-    searchTerm,
     visibleColumns,
     filterConditions,
     sortColumn,
@@ -227,8 +215,6 @@ export function TableViewProvider({ connectionId, databaseName, tableName, schem
     handleSubmitRequest: queryActions.handleSubmitRequest,
     handlePageChange,
     handlePageSizeChange,
-    setSearchTerm,
-    handleSearchSubmit,
     handleSort,
     clearSort,
     setActiveColumnMenu,
diff --git a/dataflow/src/components/database/sql/TableView/types.ts b/dataflow/src/components/database/sql/TableView/types.ts
index cbc335c91..162128556 100644
--- a/dataflow/src/components/database/sql/TableView/types.ts
+++ b/dataflow/src/components/database/sql/TableView/types.ts
@@ -93,7 +93,6 @@ export interface TableViewState {
   pageSize: number
   total: number
   totalPages: number
-  searchTerm: string
   visibleColumns: string[]
   filterConditions: FilterCondition[]
   sortColumn: string | null
@@ -125,8 +124,6 @@ export interface TableViewActions {
   handleSubmitRequest: (overridePageOffset?: number) => Promise<void>
   handlePageChange: (page: number) => void
   handlePageSizeChange: (size: number) => void
-  setSearchTerm: (term: string) => void
-  handleSearchSubmit: () => void
   handleSort: (column: string, direction: 'asc' | 'desc') => void
   clearSort: () => void
   setActiveColumnMenu: (col: string | null) => void
diff --git a/dataflow/src/components/database/sql/TableView/useDataQuery.ts b/dataflow/src/components/database/sql/TableView/useDataQuery.ts
index 89c462c5b..cf5813948 100644
--- a/dataflow/src/components/database/sql/TableView/useDataQuery.ts
+++ b/dataflow/src/components/database/sql/TableView/useDataQuery.ts
@@ -9,7 +9,6 @@ import {
 } from '@graphql'
 import { transformRowsResult, type TableData } from '@/utils/graphql-transforms'
 import { resolveSchemaParam } from '@/utils/database-features'
-import { parseSearchToWhereCondition, mergeSearchWithWhere } from '@/utils/search-parser'
 import { useI18n } from '@/i18n/useI18n'
 import type { FilterCondition } from './types'
 
@@ -20,7 +19,6 @@ interface UseDataQueryParams {
   tableName: string
   currentPage: number
   pageSize: number
-  searchTerm: string
   sortColumn: string | null
   sortDirection: 'asc' | 'desc' | null
   filterConditions: FilterCondition[]
@@ -57,7 +55,6 @@ export function useDataQuery(params: UseDataQueryParams): { state: DataQueryStat
     tableName,
     currentPage,
     pageSize,
-    searchTerm,
     sortColumn,
     sortDirection,
     filterConditions,
@@ -78,20 +75,10 @@ export function useDataQuery(params: UseDataQueryParams): { state: DataQueryStat
 
   const latestRequestIdRef = useRef(0)
   const filterConditionsRef = useRef(filterConditions)
-  const columnsRef = useRef<{ names: string[]; types: string[] }>({ names: [], types: [] })
 
   // Keep refs in sync
   useEffect(() => { filterConditionsRef.current = filterConditions }, [filterConditions])
 
-  useEffect(() => {
-    if (data?.columns && data.columns.length > 0) {
-      columnsRef.current = {
-        names: data.columns,
-        types: data.columns.map(c => data.columnTypes[c] ?? 'string'),
-      }
-    }
-  }, [data?.columns, data?.columnTypes])
-
   const handleSubmitRequest = useCallback(async (overridePageOffset?: number) => {
     const conn = connections.find((c) => c.id === connectionId)
     if (!conn) return
@@ -134,16 +121,7 @@ export function useDataQuery(params: UseDataQueryParams): { state: DataQueryStat
       }
     }
 
-    // Build search where condition
-    const searchWhere = searchTerm.trim()
-      ? parseSearchToWhereCondition(
-          searchTerm,
-          columnsRef.current.names,
-          columnsRef.current.types,
-        )
-      : undefined
-
-    const where = mergeSearchWithWhere(searchWhere, filterWhere)
+    const where = filterWhere
 
     try {
       const { data: result, error: queryError } = await getRows({
@@ -182,7 +160,7 @@ export function useDataQuery(params: UseDataQueryParams): { state: DataQueryStat
         setLoading(false)
       }
     }
-  }, [connections, connectionId, databaseName, schema, tableName, sortColumn, sortDirection, searchTerm, pageSize, currentPage, getRows, visibleColumnsCount, onInitVisibleColumns, t])
+  }, [connections, connectionId, databaseName, schema, tableName, sortColumn, sortDirection, pageSize, currentPage, getRows, visibleColumnsCount, onInitVisibleColumns, t])
 
   // Fetch on mount and when data-changing params change
   useEffect(() => {
diff --git a/dataflow/src/i18n/locales/en/mongodb.ts b/dataflow/src/i18n/locales/en/mongodb.ts
index dd7633afe..6b3febb65 100644
--- a/dataflow/src/i18n/locales/en/mongodb.ts
+++ b/dataflow/src/i18n/locales/en/mongodb.ts
@@ -23,9 +23,14 @@ export const enMongodbMessages = {
   'mongodb.collection.deleteDocumentTitle': 'Delete Document',
   'mongodb.collection.deleteDocumentMessage':
     'Are you sure you want to delete this document? This action cannot be undone.',
+  'mongodb.view.table': 'Table View',
+  'mongodb.view.json': 'JSON View',
+  'mongodb.view.switchToTable': 'Switch to Table View',
+  'mongodb.view.switchToJson': 'Switch to JSON View',
   'mongodb.document.add': 'Add Document',
   'mongodb.document.addTitle': 'Add New Document',
   'mongodb.document.addDescription': 'Enter the document content in JSON format:',
+  'mongodb.document.placeholder': '{ ... }',
   'mongodb.document.edit': 'Edit Document',
   'mongodb.document.editTitle': 'Edit Document',
   'mongodb.document.delete': 'Delete Document',
@@ -69,6 +74,21 @@ export const enMongodbMessages = {
   'mongodb.error.fetchCollectionData': 'Failed to fetch collection data',
 
   'mongodb.error.uniqueFieldsOnly': 'Each field can only appear once in the filter conditions.',
+  'mongodb.table.idBadge': 'ID',
+  'mongodb.table.fieldType': 'field',
+  'mongodb.table.columnActions': 'Column Actions',
+  'mongodb.table.sortAsc': 'Sort Ascending',
+  'mongodb.table.sortDesc': 'Sort Descending',
+  'mongodb.table.clearSort': 'Clear Sort',
+  'mongodb.table.filterColumn': 'Filter This Field',
+  'mongodb.table.unset': '<unset>',
+  'mongodb.table.null': 'NULL',
+  'mongodb.table.invalidNumber': 'Enter a valid number for this field.',
+  'mongodb.table.invalidBoolean': 'Enter true or false for this field.',
+  'mongodb.table.complexInlineEdit': 'Object and array fields must be edited in the field JSON editor.',
+  'mongodb.fieldJson.editTitle': 'Edit {field}',
+  'mongodb.fieldJson.description': 'Edit this field as a JSON value.',
+  'mongodb.fieldJson.invalidJson': 'Invalid JSON: {error}',
   'mongodb.export.title': 'Export Collection',
   'mongodb.export.filterQuery': 'Filter Query (Optional)',
   'mongodb.export.filterPlaceholder': '{ "status": "active" }',
diff --git a/dataflow/src/i18n/locales/zh/mongodb.ts b/dataflow/src/i18n/locales/zh/mongodb.ts
index 5e50bbd23..e9ee832ea 100644
--- a/dataflow/src/i18n/locales/zh/mongodb.ts
+++ b/dataflow/src/i18n/locales/zh/mongodb.ts
@@ -15,9 +15,14 @@ export const zhMongodbMessages = {
   'mongodb.collection.addData': '新增文档',
   'mongodb.collection.deleteDocumentTitle': '删除文档',
   'mongodb.collection.deleteDocumentMessage': '确定要删除此文档吗？此操作无法撤销。',
+  'mongodb.view.table': '表格视图',
+  'mongodb.view.json': 'JSON 视图',
+  'mongodb.view.switchToTable': '切换到表格视图',
+  'mongodb.view.switchToJson': '切换到 JSON 视图',
   'mongodb.document.add': '新增文档',
   'mongodb.document.addTitle': '新增文档',
   'mongodb.document.addDescription': '请输入 JSON 格式的文档内容：',
+  'mongodb.document.placeholder': '{ ... }',
   'mongodb.document.edit': '编辑文档',
   'mongodb.document.editTitle': '编辑文档',
   'mongodb.document.delete': '删除文档',
@@ -60,6 +65,21 @@ export const zhMongodbMessages = {
   'mongodb.error.fetchCollectionData': '获取集合数据失败',
 
   'mongodb.error.uniqueFieldsOnly': '每个字段在筛选条件中只能出现一次。',
+  'mongodb.table.idBadge': 'ID',
+  'mongodb.table.fieldType': '字段',
+  'mongodb.table.columnActions': '列操作',
+  'mongodb.table.sortAsc': '升序排序',
+  'mongodb.table.sortDesc': '降序排序',
+  'mongodb.table.clearSort': '清除排序',
+  'mongodb.table.filterColumn': '筛选此字段',
+  'mongodb.table.unset': '<unset>',
+  'mongodb.table.null': 'NULL',
+  'mongodb.table.invalidNumber': '请输入有效数字。',
+  'mongodb.table.invalidBoolean': '请输入 true 或 false。',
+  'mongodb.table.complexInlineEdit': '对象和数组字段需要在字段 JSON 编辑器中编辑。',
+  'mongodb.fieldJson.editTitle': '编辑 {field}',
+  'mongodb.fieldJson.description': '以 JSON 值编辑此字段。',
+  'mongodb.fieldJson.invalidJson': 'JSON 无效：{error}',
   'mongodb.export.title': '导出集合',
   'mongodb.export.filterQuery': '筛选条件（可选）',
   'mongodb.export.filterPlaceholder': '{ "status": "active" }',
diff --git a/dataflow/src/test/mongodb-table-utils.test.ts b/dataflow/src/test/mongodb-table-utils.test.ts
new file mode 100644
index 000000000..df7ed3ceb
--- /dev/null
+++ b/dataflow/src/test/mongodb-table-utils.test.ts
@@ -0,0 +1,143 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+  buildMongoTableColumns,
+  buildRenderedMongoDocuments,
+  coerceMongoCellDraft,
+  hasDocumentField,
+  isMongoCellChanged,
+  parseMongoFieldJsonDraft,
+} from '@/components/database/mongodb/CollectionView/mongo-table-utils'
+
+describe('buildMongoTableColumns', () => {
+  it('keeps _id first and sorts discovered fields alphabetically', () => {
+    const columns = buildMongoTableColumns({
+      sampledFields: ['status', 'profile', 'name'],
+      documents: [{ _id: '1', age: 21 }],
+      changes: new Map(),
+    })
+
+    expect(columns).toEqual(['_id', 'age', 'name', 'profile', 'status'])
+  })
+
+  it('includes fields introduced by pending changes', () => {
+    const columns = buildMongoTableColumns({
+      sampledFields: [],
+      documents: [{ _id: '1', name: 'Ada' }],
+      changes: new Map([
+        ['existing-0', {
+          type: 'update',
+          originalDocument: { _id: '1', name: 'Ada' },
+          document: { _id: '1', name: 'Ada', role: 'admin' },
+        }],
+      ]),
+    })
+
+    expect(columns).toEqual(['_id', 'name', 'role'])
+  })
+})
+
+describe('buildRenderedMongoDocuments', () => {
+  it('renders pending inserts before existing documents and applies pending updates', () => {
+    const rows = buildRenderedMongoDocuments({
+      documents: [{ _id: '1', name: 'Ada' }],
+      pageOffset: 0,
+      newRowOrder: ['new-1'],
+      changes: new Map([
+        ['new-1', {
+          type: 'insert',
+          originalDocument: {},
+          document: { name: 'Grace' },
+        }],
+        ['existing-0', {
+          type: 'update',
+          originalDocument: { _id: '1', name: 'Ada' },
+          document: { _id: '1', name: 'Ada Lovelace' },
+        }],
+      ]),
+    })
+
+    expect(rows.map((row) => row.doc)).toEqual([
+      { name: 'Grace' },
+      { _id: '1', name: 'Ada Lovelace' },
+    ])
+    expect(rows[0].isInserted).toBe(true)
+    expect(rows[1].changeType).toBe('update')
+  })
+})
+
+describe('MongoDB table cell helpers', () => {
+  it('distinguishes unset fields from null values', () => {
+    const document = { present: null }
+
+    expect(hasDocumentField(document, 'present')).toBe(true)
+    expect(hasDocumentField(document, 'missing')).toBe(false)
+  })
+
+  it('detects fields added by editing an unset cell', () => {
+    expect(isMongoCellChanged({ _id: '1' }, { _id: '1', status: 'active' }, 'status')).toBe(true)
+  })
+
+  it('preserves existing scalar types when coercing cell drafts', () => {
+    expect(coerceMongoCellDraft(1, '2', true)).toEqual({ ok: true, value: 2 })
+    expect(coerceMongoCellDraft(false, 'true', true)).toEqual({ ok: true, value: true })
+    expect(coerceMongoCellDraft('Ada', 'Grace', true)).toEqual({ ok: true, value: 'Grace' })
+  })
+
+  it('coerces complete JSON object or array drafts into complex values', () => {
+    expect(coerceMongoCellDraft('paid', '{"method":"card"}', true)).toEqual({
+      ok: true,
+      value: { method: 'card' },
+    })
+    expect(coerceMongoCellDraft(1, '[1,"a",{"x":true}]', true)).toEqual({
+      ok: true,
+      value: [1, 'a', { x: true }],
+    })
+    expect(coerceMongoCellDraft(false, '  {}  ', true)).toEqual({ ok: true, value: {} })
+  })
+
+  it('creates string values for null or unset fields', () => {
+    expect(coerceMongoCellDraft(null, 'active', true)).toEqual({ ok: true, value: 'active' })
+    expect(coerceMongoCellDraft(undefined, 'active', false)).toEqual({ ok: true, value: 'active' })
+  })
+
+  it('coerces complete JSON object or array drafts for null or unset fields', () => {
+    expect(coerceMongoCellDraft(null, '{}', true)).toEqual({ ok: true, value: {} })
+    expect(coerceMongoCellDraft(undefined, '[]', false)).toEqual({ ok: true, value: [] })
+  })
+
+  it('saves quoted object or array literals as strings when string values are allowed', () => {
+    expect(coerceMongoCellDraft('paid', '"{}"', true)).toEqual({ ok: true, value: '{}' })
+    expect(coerceMongoCellDraft(null, '"[]"', true)).toEqual({ ok: true, value: '[]' })
+    expect(coerceMongoCellDraft(undefined, '"{\\"method\\":\\"card\\"}"', false)).toEqual({
+      ok: true,
+      value: '{"method":"card"}',
+    })
+  })
+
+  it('keeps quoted object or array literals on the normal scalar path when string values are not allowed', () => {
+    expect(coerceMongoCellDraft(1, '"{}"', true)).toEqual({ ok: false, error: 'invalid-number' })
+    expect(coerceMongoCellDraft(false, '"[]"', true)).toEqual({ ok: false, error: 'invalid-boolean' })
+  })
+
+  it('keeps invalid object-like drafts on the normal scalar coercion path', () => {
+    expect(coerceMongoCellDraft('paid', '{method:"card"}', true)).toEqual({ ok: true, value: '{method:"card"}' })
+    expect(coerceMongoCellDraft(null, '[1,', true)).toEqual({ ok: true, value: '[1,' })
+    expect(coerceMongoCellDraft(1, '{method:"card"}', true)).toEqual({ ok: false, error: 'invalid-number' })
+    expect(coerceMongoCellDraft(false, '[1,', true)).toEqual({ ok: false, error: 'invalid-boolean' })
+  })
+
+  it('keeps scalar string whitespace when no object or array is detected', () => {
+    expect(coerceMongoCellDraft('paid', '  active  ', true)).toEqual({ ok: true, value: '  active  ' })
+  })
+
+  it('accepts any valid JSON value for field JSON edits', () => {
+    expect(parseMongoFieldJsonDraft('{"status":"paid"}')).toEqual({ ok: true, value: { status: 'paid' } })
+    expect(parseMongoFieldJsonDraft('"paid"')).toEqual({ ok: true, value: 'paid' })
+    expect(parseMongoFieldJsonDraft('null')).toEqual({ ok: true, value: null })
+  })
+
+  it('rejects empty field JSON edits instead of treating them as deletion', () => {
+    expect(parseMongoFieldJsonDraft('')).toMatchObject({ ok: false })
+  })
+})
diff --git a/dataflow/src/utils/search-parser.ts b/dataflow/src/utils/search-parser.ts
deleted file mode 100644
index 010bc55a4..000000000
--- a/dataflow/src/utils/search-parser.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-import { WhereCondition, WhereConditionType } from '@graphql';
-
-/**
- * Parsed search query result
- */
-export type ParsedSearch = {
-    type: 'column-specific' | 'full-text' | 'compound';
-    column?: string;
-    operator?: string;
-    value?: string;
-    rawValue?: string;
-    compoundOperator?: 'AND' | 'OR';
-    conditions?: ParsedSearch[];
-};
-
-/**
- * Parse a search string into structured query components
- * Supports:
- * - Column-specific: "id=1", "name = Alice", "age > 18"
- * - Wildcards: "name=%Alice%", "email LIKE %@gmail.com"
- * - Compound: "id=1 AND name=Alice", "age>18 OR status=active"
- * - Full-text: "Alice" (searches all columns)
- */
-export function parseSearchString(search: string): ParsedSearch {
-    const trimmed = search.trim();
-
-    if (!trimmed) {
-        return { type: 'full-text', rawValue: '' };
-    }
-
-    // Check for compound conditions (AND/OR)
-    // Split by AND/OR while preserving which operator was used
-    const compoundMatch = splitByLogicalOperators(trimmed);
-
-    if (compoundMatch && compoundMatch.parts.length > 1) {
-        // Parse each part as an atomic condition, ensuring each part is trimmed
-        const conditions = compoundMatch.parts
-            .map(part => part.trim())
-            .filter(part => part.length > 0)
-            .map(part => parseAtomicCondition(part));
-
-        // If all parts are valid column-specific conditions, create compound
-        if (conditions.every(c => c.type === 'column-specific')) {
-            return {
-                type: 'compound',
-                compoundOperator: compoundMatch.operator,
-                conditions,
-                rawValue: trimmed
-            };
-        }
-        // Otherwise fall back to full-text search
-        return { type: 'full-text', rawValue: trimmed };
-    }
-
-    // No compound operators - parse as atomic condition
-    return parseAtomicCondition(trimmed);
-}
-
-/**
- * Parse a single atomic condition (no AND/OR)
- */
-function parseAtomicCondition(search: string): ParsedSearch {
-    const trimmed = search.trim();
-
-    if (!trimmed) {
-        return { type: 'full-text', rawValue: '' };
-    }
-
-    // Match column-specific patterns: column operator value
-    // Operators: =, !=, <>, >, <, >=, <=, LIKE, NOT LIKE, IN, NOT IN, IS, IS NOT
-    const columnPattern = /^([a-zA-Z_][a-zA-Z0-9_]*)\s*(=|!=|<>|>=|<=|>|<|LIKE|NOT\s+LIKE|IN|NOT\s+IN|IS|IS\s+NOT)\s*(.+)$/i;
-    const match = trimmed.match(columnPattern);
-
-    if (match) {
-        const [, column, operator, value] = match;
-        // Trim all components to handle cases like "likes_count=42 " with trailing space
-        const trimmedColumn = column.trim();
-        const trimmedOperator = operator.trim().toUpperCase();
-        const trimmedValue = value.trim();
-
-        // Validate that we have non-empty values after trimming
-        if (!trimmedColumn || !trimmedOperator || !trimmedValue) {
-            return { type: 'full-text', rawValue: trimmed };
-        }
-
-        return {
-            type: 'column-specific',
-            column: trimmedColumn,
-            operator: trimmedOperator,
-            value: trimmedValue,
-            rawValue: trimmed
-        };
-    }
-
-    // No column pattern found - treat as full-text search
-    return {
-        type: 'full-text',
-        rawValue: trimmed
-    };
-}
-
-/**
- * Split search string by AND/OR operators
- * Returns null if no operators found, otherwise returns parts and the operator used
- */
-function splitByLogicalOperators(search: string): { operator: 'AND' | 'OR'; parts: string[] } | null {
-    // Look for AND operator (must be surrounded by spaces or at boundaries)
-    const andPattern = /\s+AND\s+/i;
-    const orPattern = /\s+OR\s+/i;
-
-    const hasAnd = andPattern.test(search);
-    const hasOr = orPattern.test(search);
-
-    if (hasAnd && hasOr) {
-        // Both AND and OR - not supported yet, treat as full-text
-        return null;
-    }
-
-    if (hasAnd) {
-        const parts = search.split(andPattern);
-        if (parts.length > 1) {
-            return { operator: 'AND', parts };
-        }
-    }
-
-    if (hasOr) {
-        const parts = search.split(orPattern);
-        if (parts.length > 1) {
-            return { operator: 'OR', parts };
-        }
-    }
-
-    return null;
-}
-
-/**
- * Convert parsed search into a WhereCondition
- * @param parsed - Parsed search result
- * @param columns - Available column names for full-text search
- * @param columnTypes - Column types (for type inference)
- * @param validOperators - Valid operators for the database
- */
-export function parseSearchToWhereCondition(
-    search: string,
-    columns: string[],
-    columnTypes?: (string | undefined)[],
-    validOperators?: string[]
-): WhereCondition | undefined {
-    const parsed = parseSearchString(search);
-
-    if (!parsed.rawValue) {
-        return undefined;
-    }
-
-    // Handle compound conditions (AND/OR)
-    if (parsed.type === 'compound' && parsed.conditions && parsed.compoundOperator) {
-        const atomicConditions: WhereCondition[] = [];
-
-        // Convert each parsed condition to a WhereCondition
-        for (const condition of parsed.conditions) {
-            if (condition.type === 'column-specific' && condition.column && condition.operator && condition.value) {
-                const atomicCondition = createAtomicCondition(
-                    condition.column,
-                    condition.operator,
-                    condition.value,
-                    columns,
-                    columnTypes,
-                    validOperators
-                );
-
-                if (atomicCondition) {
-                    atomicConditions.push(atomicCondition);
-                } else {
-                    // If any condition is invalid, fall back to full-text search
-                    return createFullTextCondition(parsed.rawValue!, columns, columnTypes);
-                }
-            }
-        }
-
-        // Create compound condition
-        if (atomicConditions.length === 0) {
-            return undefined;
-        }
-
-        if (atomicConditions.length === 1) {
-            return atomicConditions[0];
-        }
-
-        if (parsed.compoundOperator === 'AND') {
-            return {
-                Type: WhereConditionType.And,
-                And: {
-                    Children: atomicConditions
-                }
-            };
-        } else {
-            return {
-                Type: WhereConditionType.Or,
-                Or: {
-                    Children: atomicConditions
-                }
-            };
-        }
-    }
-
-    if (parsed.type === 'column-specific' && parsed.column && parsed.operator && parsed.value) {
-        return createAtomicCondition(
-            parsed.column,
-            parsed.operator,
-            parsed.value,
-            columns,
-            columnTypes,
-            validOperators
-        ) || createFullTextCondition(parsed.rawValue!, columns, columnTypes);
-    }
-
-    // Full-text search across all text columns
-    return createFullTextCondition(parsed.rawValue!, columns, columnTypes);
-}
-
-/**
- * Create an atomic WHERE condition from column, operator, and value
- */
-function createAtomicCondition(
-    column: string,
-    operator: string,
-    value: string,
-    columns: string[],
-    columnTypes?: (string | undefined)[],
-    validOperators?: string[]
-): WhereCondition | undefined {
-    // Ensure all inputs are trimmed
-    const trimmedColumn = column.trim();
-    const trimmedOperator = operator.trim();
-    const trimmedValue = value.trim();
-
-    // Validate non-empty after trimming
-    if (!trimmedColumn || !trimmedOperator || !trimmedValue) {
-        return undefined;
-    }
-
-    // Validate column exists
-    const columnIndex = columns.findIndex(col =>
-        col.toLowerCase() === trimmedColumn.toLowerCase()
-    );
-
-    if (columnIndex === -1) {
-        return undefined;
-    }
-
-    // Validate operator if validOperators provided
-    if (validOperators && !validOperators.includes(trimmedOperator)) {
-        return undefined;
-    }
-
-    const actualColumn = columns[columnIndex];
-    const columnType = columnTypes?.[columnIndex] || 'string';
-
-    // Clean up value - remove quotes if present
-    let cleanValue = trimmedValue;
-    if ((cleanValue.startsWith("'") && cleanValue.endsWith("'")) ||
-        (cleanValue.startsWith('"') && cleanValue.endsWith('"'))) {
-        cleanValue = cleanValue.slice(1, -1);
-    }
-
-    // Handle wildcards in LIKE operator
-    if (trimmedOperator === 'LIKE' || trimmedOperator === 'NOT LIKE') {
-        // Keep wildcards as-is (%, _)
-        // User can specify: name=%Alice% or name=Alice (we'll add % % for them)
-        if (!cleanValue.includes('%') && !cleanValue.includes('_')) {
-            cleanValue = `%${cleanValue}%`;
-        }
-    }
-
-    return {
-        Type: WhereConditionType.Atomic,
-        Atomic: {
-            Key: actualColumn,
-            Operator: trimmedOperator,
-            Value: cleanValue,
-            ColumnType: inferColumnType(columnType)
-        }
-    };
-}
-
-/**
- * Create a full-text search condition that searches across all suitable columns
- */
-function createFullTextCondition(
-    searchText: string,
-    columns: string[],
-    columnTypes?: (string | undefined)[]
-): WhereCondition | undefined {
-    // Filter to searchable columns (text-based types)
-    const searchableColumns = columns.filter((_, index) => {
-        const type = columnTypes?.[index]?.toLowerCase() || '';
-        return isTextType(type);
-    });
-
-    if (searchableColumns.length === 0) {
-        // No searchable columns - search all columns
-        return createOrCondition(columns, searchText, columnTypes);
-    }
-
-    return createOrCondition(searchableColumns, searchText, columnTypes);
-}
-
-/**
- * Create an OR condition across multiple columns
- */
-function createOrCondition(
-    columns: string[],
-    searchText: string,
-    columnTypes?: (string | undefined)[]
-): WhereCondition | undefined {
-    if (columns.length === 0) {
-        return undefined;
-    }
-
-    const conditions: WhereCondition[] = columns.map((column, index) => {
-        const columnType = columnTypes?.[columns.indexOf(column)] || 'string';
-
-        return {
-            Type: WhereConditionType.Atomic,
-            Atomic: {
-                Key: column,
-                Operator: 'LIKE',
-                Value: `%${searchText}%`,
-                ColumnType: inferColumnType(columnType)
-            }
-        };
-    });
-
-    if (conditions.length === 1) {
-        return conditions[0];
-    }
-
-    return {
-        Type: WhereConditionType.Or,
-        Or: {
-            Children: conditions
-        }
-    };
-}
-
-/**
- * Check if a column type is text-based and searchable
- */
-function isTextType(type: string): boolean {
-    const textTypes = [
-        'text', 'varchar', 'char', 'string', 'nvarchar', 'nchar',
-        'clob', 'longtext', 'mediumtext', 'tinytext',
-        'character', 'varying'
-    ];
-
-    return textTypes.some(t => type.includes(t));
-}
-
-/**
- * Infer a simple column type for the GraphQL WhereCondition
- */
-function inferColumnType(dbType: string): string {
-    const lower = dbType.toLowerCase();
-
-    if (lower.includes('int') || lower.includes('number') || lower.includes('decimal') ||
-        lower.includes('float') || lower.includes('double') || lower.includes('numeric')) {
-        return 'number';
-    }
-
-    if (lower.includes('bool')) {
-        return 'boolean';
-    }
-
-    if (lower.includes('date') || lower.includes('time')) {
-        return 'date';
-    }
-
-    return 'string';
-}
-
-/**
- * Merge search condition with existing where condition
- */
-export function mergeSearchWithWhere(
-    searchCondition: WhereCondition | undefined,
-    whereCondition: WhereCondition | undefined
-): WhereCondition | undefined {
-    if (!searchCondition && !whereCondition) {
-        return undefined;
-    }
-
-    if (!searchCondition) {
-        return whereCondition;
-    }
-
-    if (!whereCondition) {
-        return searchCondition;
-    }
-
-    // Both exist - create AND condition
-    return {
-        Type: WhereConditionType.And,
-        And: {
-            Children: [whereCondition, searchCondition]
-        }
-    };
-}
diff --git a/docs/adr/0001-bound-mongodb-field-inference-to-a-document-sample.md b/docs/adr/0001-bound-mongodb-field-inference-to-a-document-sample.md
new file mode 100644
index 000000000..d1a61c90c
--- /dev/null
+++ b/docs/adr/0001-bound-mongodb-field-inference-to-a-document-sample.md
@@ -0,0 +1,3 @@
+# Bound MongoDB Field Inference To A Document Sample
+
+MongoDB collection table columns are inferred from a bounded document sample so collection browsing stays responsive on large collections. The resulting **Sampled Field Set** is intentionally not a complete schema; fields outside the sample can still appear through the current page or pending document changes.