morluto/rea

Fork

You've already forked rea

mirror of https://github.com/morluto/rea.git synced 2026-11-05 06:45:22 +00:00

Code Issues 1.3k Projects Packages Wiki Activity

[PR #1910] [MERGED] fix(mcp): provide native evidence paging continuation #4902

New issue

Closed

opened 2026-10-31 00:56:36 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-31 00:56:36 +00:00

Owner

Copy link

📋 Pull Request Information

Original PR: https://github.com/morluto/rea/pull/1910
Author: @cold-atom
Created: 10/11/2026
Status: ✅ Merged
Merged: 10/11/2026
Merged by: @N0zoM1z0

Base: main ← Head: fix/1849-native-evidence-continuation

📝 Commits (5)

830eee2 fix(mcp): provide native evidence paging continuation
d150890 Merge remote-tracking branch 'upstream/main' into fix/1849-native-evidence-continuation
79bd300 test(mcp): exercise native continuation through the transport
9281746 chore: merge upstream main and resolve audit wording conflict
d0aedf6 test(mcp): bind native continuation size to the transport budget

📊 Changes

3 files changed (+138 additions, -8 deletions)

View changed files

📝 docs/mcp-contracts.md (+12 -2)
📝 src/server/toolResult.ts (+35 -6)
📝 tests/boundary/mcp/analysisViewMcp.test.ts (+91 -0)

📄 Description

Summary

Give callers a ready-to-call pseudocode page when completed native function Evidence exceeds MCP delivery capacity. Preserve the complete canonical record and only offer continuation after session recording is acknowledged.

Fixes #1849.

Problem and expected behavior

An oversized analyze_function result already retains useful Evidence, but generic export advice leaves callers to reconstruct the supported view request. The error should supply exact arguments for the existing bounded source view, without silently replacing or truncating the requested full result.

Change and scope

Attach a named, schema-validated inspect_analysis_view continuation to the completed-result transport error. Start at offset zero with the existing 64-unit default, then follow coverage.next_offset. Keep export advice and explain that arbitrary source or metadata can still require a smaller limit or export. The follow-up regression checks the pinned SDK receive-buffer bound rather than a fixed 12,000-byte envelope; preserved caller paths make envelope size depend on the local directory.

Contract and boundary impact

Semantic owner and earliest changed stage: MCP result delivery, after explicit Evidence recording acknowledgment.
CLI and MCP/tool-catalog contract: additive details.reported_limits.continuation and actionable remediation; reuse the existing named input contract. CLI behavior and advertised operation schemas are unchanged.
Provider, bridge, target-format, or platform compatibility: native function results from existing providers; no engine, import or bridge changes.
Evidence, artifact, provenance, or reconstruction contract: preserve full canonical result, exact procedure parameters, target digest and retained reference. No new recording claim for unacknowledged or failed retention.
Process execution, authorization, cleanup, or containment impact: no expanded authority or process changes; view retrieval does not invoke the provider again.
Generated metadata (docs/public/product-catalog.json), package, or installation impact: owning MCP documentation updated; no dependency, installer or authored catalog-schema change.

Evidence and regression coverage

Tests added or updated: obtain a completed-result transport failure through the registered Ghidra adapter and MCP client, use its continuation directly, retrieve exact first/second source slices, preserve complete parent Evidence, and ping successfully. Existing delivery, unacknowledged retention, failed retention and oversized-view regressions retained.
Base reproduction or other evidence: the parent implementation only supplies the retained reference and generic export guidance. Review of head 92817465f also reproduced a path-dependent assertion: a correct 64-unit page serialized to 12,017 bytes, exceeding an arbitrary 12,000-byte test threshold. Follow-up d0aedf63e uses the actual protocol bound.
User-visible CLI/MCP output: reported_limits.continuation.name is inspect_analysis_view; its arguments contain the reported retained reference and {kind: "native", facet: "pseudocode", offset: 0, limit: 64}. The next page uses the returned offset.
Remaining proof gaps: paging improves delivery and continuation, not native analysis cost or general directory projection. Real Hopper/IDA and local Windows/macOS provider runs were not performed. Simulated Ghidra results establish transport semantics, not engine correctness.

For evidence-bearing changes:

Observed, derived, and inferred claims remain distinguishable.
Artifact identity, source provenance, and failed attempts remain preserved.
Unsupported, incomplete, unavailable, or uncertain outcomes remain visible.

Validation performed

npm run test:focused -- tests/boundary/mcp/analysisViewMcp.test.ts tests/boundary/mcp/toolResult.test.ts src/server/toolResultEncoding.test.ts — 28 passed across 3 files, including the follow-up on an isolated long-path worktree.
npm run check — passed, including typecheck, lint, formatting, metadata/unused-code checks and architecture guards.
npm run docs:check — passed.
Fresh stdio MCP with real Ghidra 12.1.4, unchanged stripped x86-64 ELF and procedure 0x41bf30: full result exceeded the 10,485,760-byte receive buffer (at least 10,512,118 bytes). Used the supplied continuation directly: first/second responses each 28,863 bytes, exact 64-unit source slices, next offsets 64/128. Export verified the complete 39,225 UTF-16-unit pseudocode and original selected procedure/digest. Ping, explicit close and unchanged target bytes passed.
The real-provider workflow completed in 275.20 s, including startup, export and close, under one CPU, 768-MiB Java heap and a 3-GiB scope. Peak memory 1,268,264,960 bytes; all scope OOM/max events zero.

Compatibility, safety, and release

Breaking changes or migration steps: none; complete-result requests retain their contract and transport guard. A continuation is an optional recovery request, not an automatic fallback or completeness guarantee.
Real Hopper/Ghidra, browser, or OS coverage: real Linux Ghidra through stdio MCP verified above; remaining local provider/platform scope explicitly unverified.
Package or release metadata impact: no dependency/version edits; owning delivery documentation updated.
Security, privacy, process, or containment review: no source execution, executable mutation, GUI control, native database save or added installation. Canonical provenance and caller-selected inputs remain intact; local artifacts and verification files are not committed.

Review checklist

This PR addresses a concrete problem or an agreed enhancement.
The PR has one focused outcome and the title follows type(scope): outcome.
Related issue is linked, or the reason for not linking one is stated above.
Tests cover changed observable behavior and meaningful failure paths.
Owning docs, contracts, and generated metadata are updated where needed.
User-visible CLI/MCP changes include representative output.
I checked the final diff for secrets, unrelated cleanup, and unsupported claims.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/morluto/rea/pull/1910 **Author:** [@cold-atom](https://github.com/cold-atom) **Created:** 10/11/2026 **Status:** ✅ Merged **Merged:** 10/11/2026 **Merged by:** [@N0zoM1z0](https://github.com/N0zoM1z0) **Base:** `main` ← **Head:** `fix/1849-native-evidence-continuation` --- ### 📝 Commits (5) - [`830eee2`](https://github.com/morluto/rea/commit/830eee209e00b0fb7db77897fb27ca5d4a26742a) fix(mcp): provide native evidence paging continuation - [`d150890`](https://github.com/morluto/rea/commit/d150890129affe602e1a819317e1ba8e78429bd8) Merge remote-tracking branch 'upstream/main' into fix/1849-native-evidence-continuation - [`79bd300`](https://github.com/morluto/rea/commit/79bd3007fa064a6efac099765a8aee7d35338594) test(mcp): exercise native continuation through the transport - [`9281746`](https://github.com/morluto/rea/commit/92817465f3302ea91119c851b0db7d89b2e4b6e9) chore: merge upstream main and resolve audit wording conflict - [`d0aedf6`](https://github.com/morluto/rea/commit/d0aedf63e8af2bed9c6f3d5ee60093b011887713) test(mcp): bind native continuation size to the transport budget ### 📊 Changes **3 files changed** (+138 additions, -8 deletions) <details> <summary>View changed files</summary> 📝 `docs/mcp-contracts.md` (+12 -2) 📝 `src/server/toolResult.ts` (+35 -6) 📝 `tests/boundary/mcp/analysisViewMcp.test.ts` (+91 -0) </details> ### 📄 Description ## Summary Give callers a ready-to-call pseudocode page when completed native function Evidence exceeds MCP delivery capacity. Preserve the complete canonical record and only offer continuation after session recording is acknowledged. Fixes #1849. ## Problem and expected behavior An oversized `analyze_function` result already retains useful Evidence, but generic export advice leaves callers to reconstruct the supported view request. The error should supply exact arguments for the existing bounded source view, without silently replacing or truncating the requested full result. ## Change and scope Attach a named, schema-validated `inspect_analysis_view` continuation to the completed-result transport error. Start at offset zero with the existing 64-unit default, then follow `coverage.next_offset`. Keep export advice and explain that arbitrary source or metadata can still require a smaller limit or export. The follow-up regression checks the pinned SDK receive-buffer bound rather than a fixed 12,000-byte envelope; preserved caller paths make envelope size depend on the local directory. ## Contract and boundary impact - Semantic owner and earliest changed stage: MCP result delivery, after explicit Evidence recording acknowledgment. - CLI and MCP/tool-catalog contract: additive `details.reported_limits.continuation` and actionable remediation; reuse the existing named input contract. CLI behavior and advertised operation schemas are unchanged. - Provider, bridge, target-format, or platform compatibility: native function results from existing providers; no engine, import or bridge changes. - Evidence, artifact, provenance, or reconstruction contract: preserve full canonical result, exact procedure parameters, target digest and retained reference. No new recording claim for unacknowledged or failed retention. - Process execution, authorization, cleanup, or containment impact: no expanded authority or process changes; view retrieval does not invoke the provider again. - Generated metadata (`docs/public/product-catalog.json`), package, or installation impact: owning MCP documentation updated; no dependency, installer or authored catalog-schema change. ## Evidence and regression coverage - Tests added or updated: obtain a completed-result transport failure through the registered Ghidra adapter and MCP client, use its continuation directly, retrieve exact first/second source slices, preserve complete parent Evidence, and ping successfully. Existing delivery, unacknowledged retention, failed retention and oversized-view regressions retained. - Base reproduction or other evidence: the parent implementation only supplies the retained reference and generic export guidance. Review of head `92817465f` also reproduced a path-dependent assertion: a correct 64-unit page serialized to 12,017 bytes, exceeding an arbitrary 12,000-byte test threshold. Follow-up `d0aedf63e` uses the actual protocol bound. - User-visible CLI/MCP output: `reported_limits.continuation.name` is `inspect_analysis_view`; its arguments contain the reported retained reference and `{kind: "native", facet: "pseudocode", offset: 0, limit: 64}`. The next page uses the returned offset. - Remaining proof gaps: paging improves delivery and continuation, not native analysis cost or general directory projection. Real Hopper/IDA and local Windows/macOS provider runs were not performed. Simulated Ghidra results establish transport semantics, not engine correctness. For evidence-bearing changes: - [x] Observed, derived, and inferred claims remain distinguishable. - [x] Artifact identity, source provenance, and failed attempts remain preserved. - [x] Unsupported, incomplete, unavailable, or uncertain outcomes remain visible. ## Validation performed - `npm run test:focused -- tests/boundary/mcp/analysisViewMcp.test.ts tests/boundary/mcp/toolResult.test.ts src/server/toolResultEncoding.test.ts` — **28 passed across 3 files**, including the follow-up on an isolated long-path worktree. - `npm run check` — passed, including typecheck, lint, formatting, metadata/unused-code checks and architecture guards. - `npm run docs:check` — passed. - Fresh stdio MCP with real **Ghidra 12.1.4**, unchanged stripped x86-64 ELF and procedure `0x41bf30`: full result exceeded the 10,485,760-byte receive buffer (at least **10,512,118 bytes**). Used the supplied continuation directly: first/second responses each **28,863 bytes**, exact 64-unit source slices, next offsets **64/128**. Export verified the complete **39,225 UTF-16-unit** pseudocode and original selected procedure/digest. Ping, explicit close and unchanged target bytes passed. - The real-provider workflow completed in **275.20 s**, including startup, export and close, under one CPU, 768-MiB Java heap and a 3-GiB scope. Peak memory **1,268,264,960 bytes**; all scope OOM/max events zero. ## Compatibility, safety, and release - Breaking changes or migration steps: none; complete-result requests retain their contract and transport guard. A continuation is an optional recovery request, not an automatic fallback or completeness guarantee. - Real Hopper/Ghidra, browser, or OS coverage: real Linux Ghidra through stdio MCP verified above; remaining local provider/platform scope explicitly unverified. - Package or release metadata impact: no dependency/version edits; owning delivery documentation updated. - Security, privacy, process, or containment review: no source execution, executable mutation, GUI control, native database save or added installation. Canonical provenance and caller-selected inputs remain intact; local artifacts and verification files are not committed. ## Review checklist - [x] This PR addresses a concrete problem or an agreed enhancement. - [x] The PR has one focused outcome and the title follows `type(scope): outcome`. - [x] Related issue is linked, or the reason for not linking one is stated above. - [x] Tests cover changed observable behavior and meaningful failure paths. - [x] Owning docs, contracts, and generated metadata are updated where needed. - [x] User-visible CLI/MCP changes include representative output. - [x] I checked the final diff for secrets, unrelated cleanup, and unsupported claims. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-31 00:56:36 +00:00

closed this issue
added the
pull-request
label

No Branch/Tag specified

main

codex/procedure-reference-stacked

release-please--branches--main--components--rea-agents

release-please--branches--main--components--rea-agents--release-notes

codex/kuna-independent-retry

codex/byte-search-overlay-coverage

codex/open-failure-target-receipt

codex/kuna-xref-evidence

codex/ghidra-ambiguous-procedure-recovery

codex/function-source-bundle

codex/trace-function-integration-prototype

codex/snapshot-source-closure

codex/recorded-evidence-array-pages

codex/evidence-recovery-redesign

codex/trace-feature-address-scope

codex/call-discovery-scope

codex/ghidra-literal-candidate-evidence

codex/decompile-directory-independent-retry

codex/retry-provenance-base

codex/value-flow-capability-experiment

codex/ghidra-containing-instruction

cursor/readme-discord-button-ef9f

dependabot/github_actions/actions/setup-node-7.1.0

dependabot/github_actions/actions/upload-artifact-7.0.2

dependabot/npm_and_yarn/npm-minor-and-patch-d8d97ce6df

codex/kuna-1989

fix/8559-native-ui-fixture-ownership

fix/8555-go-verifier-mcp-ownership

codex/provider-capability-recovery

fix/8642-rizin-target-stdin

codex/ghidra-memory-effect-scope

codex/ghidra-annotation-entry-selector

codex/ghidra-readonly-recovery

codex/ghidra-regex-verifier-recovery

codex/evidence-discovery-view-guidance

fix/8545-bulk-append-overflow

fix/8428-navigation-refusal-alternatives

codex/address-context-recovery

codex/matching-member-limitations

codex/unknown-scope-contract

codex/evidence-view-guidance

feat/8373-native-trace-views

codex/ghidra-snapshot-verifier-binding

codex/elf-export-visibility

codex/evidence-view-recovery

codex/native-reference-cli-help

codex/provider-candidate-observation-scope

codex/kuna-session-verification

codex/ghidra-switch-lifetime-guidance

codex/pseudocode-paging-discovery

codex/clarify-evidence-view-support

codex/kuna-xrefs-selector-recovery

codex/context-capacity-recovery

codex/evidence-closure-large-links

codex/same-function-evidence-identity

codex/ghidra-verifier-inspected-jdk

codex/audit-guided-workflows

codex/crash-prompt-retained-dossiers

codex/analysis-view-error-recovery

codex/kuna-verifier-target-selection

codex/ghidra-selected-project-call-coverage

codex/docs-native-analysis-scope

codex/ghidra-java-socket-boundary

codex/ghidra-retained-snapshot-verifier

codex/ghidra-search-inventory-facts

fix/8284-zero-argument-parameter-bindings

fix/8198-ui-action-handler-offset

fix/8257-elf-entry-label-identity

fix/8304-deferred-output-schema-projection

fix/8277-call-path-computed-target-uncertainty

fix/pr-8089-conflicts

fix/ci-static-duplicate-export

dependabot/npm_and_yarn/lint-staged-17.6.0

dependabot/github_actions/actions/download-artifact-8.0.2

dependabot/npm_and_yarn/write-file-atomic-8.0.0

dependabot/npm_and_yarn/canonicalize-5.1.0

dependabot/github_actions/actions/cache/restore-6.1.0

dependabot/npm_and_yarn/toon-format/toon-4.4.0

dependabot/github_actions/actions/deploy-pages-5.0.1

codex/review-fixes-pr-2403

codex/review-fixes-pr-2400

codex/process-terminal-width

codex/test-brittleness-cleanup

verify/7167-browser-connect-macos

fix/7167-browser-connect

feat/native-matching-allowance-setting

feat/browser-scenario-dry-run

test/managed-caller-parameters-20261024

codex/parser-fortythird-boundaries

fix/6926-pinvoke-platform-decorations-20261023

fix/6889-har-body-encoding-20261023

fix/6888-sqlite-schema-budget-20261023

fix/dependency-security-gates-6708

cursor/evidence-overwrite-rebase-b4ac

feat/4057-verify-native-exports

fix/windows-acl-observer-overhead-20261022

cursor/erlang-beam-restack-4476

cursor/pe-certificate-review-bf32

fix/6116-javascript-application-fs-errors

fix/6061-unmapped-runtime-script-unknown

feat/browser-scenario-summary

fix/pe-certificates

codex/verify-3407

cursor/rebase-5699

cursor/rebase-5352

cursor/rebase-5600

cursor/fix-cli-schema-omission-10a8

codex/audit-hopper-shutdown-reasons-20261021

fix/demangle-swift-omitted-record

fix/nib-boolean-value-types

cursor/cancellation-partial-observation-a5ac

fix/ib-object-limit-reasons

fix/electron-fuse-limit-advice

fix/kuna-doctor-dangling-cache

fix/fixed-budget-refusal-advice

fix/js-ipc-listener-dedup

fix/js-return-member-provenance

fix/dmg-integrity-retry-advice

fix/ida-doctor-readiness

fix/kuna-version-probe-output-drain

fix/legacy-swift-runtime-name-matching

fix/dylib-lazy-load-commands

fix/browser-scenario-startup-cancel

fix/swift-nested-punycode-classification

fix/compare-unselected-scopes

fix/objc-method-budget-coverage

fix/dmg-mounted-root-observations

audit/ci-tests-20261019-round2

release/6.7.0

fix/wabt-cleanup-retry-resolution

fix/electron-fuse-elf-pe-architecture

fix/native-plist-descriptor-ownership

fix/kuna-caller-cleanup-ownership

experiment/atomic-codemode-20261016

review/first-contributor-3776

fix/call-resolution-full-read-cycles

fix/member-mutation-selection-repeat

experiment/atomic-re-tools-20261015

perf/member-mutation-lazy-origins

perf/static-network-mutation-index

fix/hopper-startup-lifecycle

audit/3050-windows-proof-20261015

feat/windows-window-capture-2183

audit/3049-windows-proof-20261015

audit/3735-macos-fixtures-20261015

fix/batch-decompile-null-pseudocode

fix/kuna-inventory-honors-jobs

experiment/browser-codemode-tool-design-20261015

fix/hopper-clean-runtime-argv

codex/review-2049-27f1b367

review-fixes/pr-2787-routing

fix/3360-scoped-this-emitters

fix/3367-replaced-global-effects

fix/3838-compact-any-value-items

test/hopper-download-probe-20261015

codex/windows-runtime-creation-red-green-20261015

codex/windows-readonly-root-red-green-20261015

codex/windows-root-share-red-green-20261015

codex/exp-1685-win-mcp-startup

codex/bug-sweep-20261015

investigate/2190-windows-package-phases

investigate/3543-macos-cli-deadline

perf/3281-reverse-tools-feedback-quality

fix/3406-hopper-doctor-fixture

fix/3341-wrapper-require-test-context

fix/3301-owned-uninstall-fixtures

fix/3164-compiler-input-ownership

fix/pcap-cleanup-stdout-newline-20261014

perf/interface-builder-summary

codex/review-fixes-pr-1977

fix/ghidra-effective-jvm-platform

fix/docs-turkish-rust-link-20261013

fix/main-maintenance-ci-20261010

fix/recover-binary-session-process-effects

codex/review-fixes-pr-2457

codex/ci-required-cancellation-gate

fix/main-format-baseline-20261013

fix/setup-preserve-entry-fields

cursor/restore-main-checks-1ffc

fix/ghidra-bridge-hashmap-import

codex/shared-ci-jadx-json-default-20261013

codex/shared-ci-ghidra-test-groups-20261013

codex/shared-ci-java-fixture-format-20261013

codex/fix-intrinsic-invocation-boundaries

test/release-preflight-reusable-jobs

test/js-parameter-provenance-expectation

fix/linux-hopper-verification-current

test/2419-ghidra-elf-probe-size

followup/pr-1544-native-ida

codex/fold-pr-2230-contribution

docs/readme-responsible-use

fix/issue-2064

fix/issue-2050

fix/issue-2053

fix/issue-1968

fix/issue-1945

experiment/codemode-bridge-20261011

fix/tool-effects-negative-wording-1904-20261012

fix/1842-electron-interop-provenance

feat/recover-javascript-multi-input

refactor/website-i18n-prep

fix/nativeaot-pe-virtual-extent

fix/browser-verifier-ci-hang

fix/pe-resources-input-selection

docs/beginner-friendly-guides

docs/beginner-setup-guide

fix/javascript-analysis-worker-1563

fix/1649-ghidra-duplicate-names

fix/javascript-export-keys-integration-1369

test/maintenance-boundary-contracts-20261011

review/javascript-export-keys-1369

review/process-live-progress-1483

test/javascript-1495-growth-ratio

fix/ci-escape-timing

docs/normalized-terminal-geometry-1450

release/6.3.0

archive/release-6.3.0-pr1381

release/6.2.0

fix/electron-preload-dynamic-override

fix/javascript-self-referential-bundler-edges

release/6.1.0

cursor/grok-client-cherry-pick-0b56

feat/signature-posture

feat/dyld-shared-cache

feat/artifact-integrity-policy

feat/pkg-inventory

release/6.0.0

chore/sync-release-5.0.0

release/5.0.0

cursor/cloud-agent-node-787e

fix/javascript-xhr-open-endpoints

review/pr-711-realpath-fallback-wording

cleanup/replay-confinement

codex/test-suite-performance

codex/issue-foundations

codex/address-open-issues-2026-07-20

agent/javascript-vite-rollup-esbuild-adapters

agent/process-cleanup

agent/triage-integration

agent/unknown-commands-registry

feat/mcp-identity-metadata

morlvps/issue_cleanup

codex/installer-redesign

morl/roadmap-investigation-core

morl/roadmap-investigation-docs

release-please--branches--main--components--rea

rea-agents-6.8.0

rea-agents-6.7.0

rea-agents-6.6.0

experiment/atomic-codemode-wait-runtime-20261016

rea-agents-6.5.0

rea-agents-6.4.0

rea-agents-6.3.0

rea-agents-6.2.0

rea-agents-6.1.0

rea-agents-6.0.0

rea-agents-5.0.0

rea-agents-4.1.0

rea-agents-4.0.1

rea-agents-4.0.0

rea-agents-3.2.1

rea-agents-3.2.0

rea-agents-3.1.0

rea-agents-3.0.0

rea-agents-2.7.0

rea-agents-2.6.0

rea-agents-2.5.1

rea-agents-2.5.0

rea-agents-2.4.0

rea-agents-2.3.0

rea-agents-2.2.0

rea-agents-2.1.0

rea-agents-2.0.0

rea-agents-1.7.0

rea-agents-1.6.0

rea-agents-1.5.0

rea-agents-1.4.0

rea-agents-1.3.0

rea-agents-1.2.0

rea-agents-1.1.0

rea-agents-1.0.0

rea-agents-0.5.0

rea-agents-0.4.0

rea-agents-0.3.0

rea-0.2.1

rea-0.2.0

Labels

Clear labels

Mirrored from GitHub Pull Request

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

morluto/rea#4902

Reference in a new issue

Repository

morluto/rea

Title

Body

No description provided.

Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?

Rows
Columns