vudt15andClaude Sonnet 5
cf542b7416
EPIC R06 (Team Hoa) - workspace/filesystem isolation, no cross-project
mutable state.
R06-T01 domain/workspaces/workspace_session.py
WorkspaceSession - project_id/workspace_root/sandbox_dir/allowed_paths
frozen snapshot + is_allowed(path), same "capture once at submit time"
shape as R04's ConversationExecutionRequest.
R06-T02 infrastructure/persistence/json/{atomic_write,workspace_repository_impl,conversation_repository_impl}.py
Real bug fixed: core/projects.py::save_project and core/history.py's
save_conversation/rename_conversation/set_pinned did a plain
path.write_text(json.dumps(...)) - two syscalls, no atomicity. A crash
between them leaves a half-written file that load_project/load_conversation
then silently treat as "missing". All four now write through
atomic_write.write_json (temp file + os.replace). WorkspaceRepository/
ConversationRepository are thin object-shaped facades over the same
(now-atomic) functions, for future application-layer callers.
NOTE: atomic_write.py is deliberately NOT named atomic_json_file.py -
R02-T01 (Team Nam) claims that filename for the same purpose app-wide;
see the checklist for the consolidation TODO.
R06-T03 infrastructure/filesystem/execution_workspace.py
ExecutionWorkspace names the output_dir/scratch_dir split that already
exists (core/chat_agent.py's flat workspace_root/.scratch) - does not
move anything.
R06-T04 ui/chat_panel.py
The actual race: ChatPanel._persist_session (saves a BACKGROUND turn's
conversation) resolved its save directory via a live
self.ctx.config.history_dir() read at save time. ui/workspace_tab.py::
_load_current mutates that same config field on every project switch, so
a turn still running when the user switched projects got saved into the
NEW project's history folder. Fixed by adding "home_history_dir" to the
per-turn ctx dict (same "home_*" snapshot convention already used for
session id/messages/title), captured at submit time. Verified with a real
offscreen-Qt test, not just a unit double:
tests/integration/test_history_dir_race.py.
R06-T05 application/workspaces/file_workspace_service.py
FileWorkspaceService - the File Explorer / AI Editor entry point for the
same safe read/write/edit operations the agent tool loop has, by calling
core/tools.py::execute_tool directly (same dispatch, same ToolContext
containment, same audit log) rather than reimplementing any of it.
New tests: tests/unit/test_workspace_session.py,
test_atomic_write_and_repositories.py, test_execution_workspace.py,
test_file_workspace_service.py, tests/integration/test_history_dir_race.py
(29 new tests, incl. 2 real offscreen-Qt integration tests).
Suite: 283 passed, 4 pre-existing failures unrelated to R05/R06 (see
checklist). check_imports: PASS. All new files < 400 LOC.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
57 lines
2.3 KiB
Python
57 lines
2.3 KiB
Python
"""write_json - crash-safe JSON writes (R06-T02).
|
|
|
|
``core/projects.py::save_project`` and ``core/history.py``'s
|
|
``save_conversation``/``rename_conversation``/``set_pinned`` all do a plain
|
|
``path.write_text(json.dumps(...))`` today. That is two syscalls with a gap in
|
|
between: a crash, a killed process, or a full disk between the truncate and
|
|
the write leaves a half-written, unparseable JSON file - the NEXT read of
|
|
that project/conversation then fails outright (``load_project`` /
|
|
``load_conversation`` already treat a parse error as "missing", so this isn't
|
|
even a loud failure - a project can silently vanish).
|
|
|
|
``write_json`` fixes this the standard way: write the full content to a
|
|
temporary file in the SAME directory (so the following replace is on one
|
|
filesystem, not crossing a mount point), then atomically rename it over the
|
|
target. Either the old file is still there, or the new one is fully there -
|
|
never a partial one.
|
|
|
|
Transitional note: EPIC R02 (Team Nam, ``docs/refactor/Refactoring_Checklist.md``
|
|
R02-T01) plans a shared ``infrastructure/persistence/json/atomic_json_file.py``
|
|
for the SAME purpose across the whole app (config, secrets, ...). This module
|
|
is deliberately named differently and scoped to R06's two repositories only,
|
|
so the two EPICs don't edit the same file in parallel; once R02-T01 lands,
|
|
``WorkspaceRepository``/``ConversationRepository`` should switch to it and
|
|
this module can go away.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
import tempfile
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
|
|
def write_json(path: Path, data: Any) -> None:
|
|
"""Serialize ``data`` as indented UTF-8 JSON and write it to ``path``
|
|
atomically. Creates parent directories if needed."""
|
|
path = Path(path)
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
text = json.dumps(data, ensure_ascii=False, indent=2)
|
|
fd, tmp_name = tempfile.mkstemp(dir=str(path.parent), prefix=f".{path.name}.", suffix=".tmp")
|
|
try:
|
|
with os.fdopen(fd, "w", encoding="utf-8") as handle:
|
|
handle.write(text)
|
|
handle.flush()
|
|
os.fsync(handle.fileno())
|
|
os.replace(tmp_name, path)
|
|
except BaseException:
|
|
try:
|
|
os.unlink(tmp_name)
|
|
except OSError:
|
|
pass
|
|
raise
|
|
|
|
|
|
__all__ = ["write_json"]
|