Harden MCP config loading and action-state retries#145
Merged
Conversation
pmbstyle
force-pushed
the
harden-mcp-config-and-action-state
branch
from
3046602 to
1412c33
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.mcp.jsonand rootmcp.json, and acceptmcpServersformat.workspace/prefix as redundant when filesystem tools already operate at the workspace root.Root Cause
The action-state verifier depended on a model classifier and missed short present-tense action claims like "Installing..."/"Устанавливаю...", so the turn could finalize while no work had started. Separately, MCP config loading only understood Octopal's canonical shapes and paths, while common MCP client config uses
.mcp.jsonwithmcpServers.Validation
uv run pytest tests/test_router_tool_budget.py::test_action_state_retry_catches_present_tense_action_commitment_without_verifier tests/test_router_tool_budget.py::test_route_retries_unbacked_action_commitment_with_tools -quv run pytest tests/test_mcp_manager.py::test_mcp_manager_reads_claude_style_mcp_servers_config tests/test_mcp_manager.py::test_mcp_manager_skips_empty_compat_config_and_reads_canonical tests/test_mcp_manager.py::test_mcp_manager_reads_legacy_workspace_mcp_config -quv run pytest tests/test_filesystem_hardening.py::test_fs_write_treats_leading_workspace_as_redundant_at_workspace_root tests/test_filesystem_hardening.py::test_fs_write_rejects_path_traversal -quv run ruff check src/octopal/runtime/octo/router.py src/octopal/infrastructure/mcp/manager.py src/octopal/tools/filesystem/path_safety.py src/octopal/tools/catalog.py tests/test_router_tool_budget.py tests/test_mcp_manager.py tests/test_filesystem_hardening.py