From be8da7a736540e251dd22918d607293e4bb87071 Mon Sep 17 00:00:00 2001
From: njzjz-bot <njzjz.bot@gmail.com>
Date: Sat, 1 Aug 2026 22:55:59 +0800
Subject: [PATCH 1/2] fix: replace local context upload destinations

Remove existing destination directories recursively and unlink files or symlinks before local-context uploads. Cover directory replacement and broken-symlink replacement.

Coding-Agent: Codex
Codex-Version: codex-cli 0.144.6
Model: gpt-5.6-sol
Reasoning-Effort: xhigh
---
 dpdispatcher/contexts/local_context.py |  9 ++++--
 tests/test_local_context.py            | 42 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/dpdispatcher/contexts/local_context.py b/dpdispatcher/contexts/local_context.py
index fa2902d5..3b0a3205 100644
--- a/dpdispatcher/contexts/local_context.py
+++ b/dpdispatcher/contexts/local_context.py
@@ -92,8 +92,13 @@ def _copy_from_local_to_remote(self, local_path, remote_path):
             raise FileNotFoundError(
                 f"cannot find uploaded file {os.path.join(local_path)}"
             )
-        if os.path.exists(remote_path):
-            os.remove(remote_path)
+        # ``lexists`` also finds broken symlinks, which must be unlinked before
+        # copying instead of accidentally following their missing target.
+        if os.path.lexists(remote_path):
+            if os.path.isdir(remote_path) and not os.path.islink(remote_path):
+                shutil.rmtree(remote_path)
+            else:
+                os.remove(remote_path)
         _check_file_path(remote_path)
 
         if self.symlink:
diff --git a/tests/test_local_context.py b/tests/test_local_context.py
index 6b506fd9..93b08efd 100644
--- a/tests/test_local_context.py
+++ b/tests/test_local_context.py
@@ -3,6 +3,7 @@
 import os
 import shutil
 import sys
+import tempfile
 import unittest
 import uuid
 from unittest.mock import MagicMock
@@ -105,6 +106,47 @@ def test_upload(self):
             f2 = os.path.join(self.tmp_remote_root, submission_hash, file)
             self.assertEqual(get_file_md5(f1), get_file_md5(f2), msg=(f1, f2))
 
+    def test_copy_replaces_existing_directory(self) -> None:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            local_path = os.path.join(temp_dir, "local")
+            remote_path = os.path.join(temp_dir, "remote")
+            os.makedirs(local_path)
+            os.makedirs(remote_path)
+            with open(os.path.join(local_path, "new.txt"), "w") as fp:
+                fp.write("new")
+            with open(os.path.join(remote_path, "old.txt"), "w") as fp:
+                fp.write("old")
+
+            context = LocalContext(
+                local_root=temp_dir,
+                remote_root=temp_dir,
+                remote_profile={"symlink": False},
+            )
+            context._copy_from_local_to_remote(local_path, remote_path)
+
+            self.assertFalse(os.path.exists(os.path.join(remote_path, "old.txt")))
+            with open(os.path.join(remote_path, "new.txt")) as fp:
+                self.assertEqual(fp.read(), "new")
+
+    def test_copy_replaces_broken_symlink(self) -> None:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            local_path = os.path.join(temp_dir, "local.txt")
+            remote_path = os.path.join(temp_dir, "remote.txt")
+            with open(local_path, "w") as fp:
+                fp.write("new")
+            os.symlink("missing.txt", remote_path)
+
+            context = LocalContext(
+                local_root=temp_dir,
+                remote_root=temp_dir,
+                remote_profile={"symlink": False},
+            )
+            context._copy_from_local_to_remote(local_path, remote_path)
+
+            self.assertFalse(os.path.islink(remote_path))
+            with open(remote_path) as fp:
+                self.assertEqual(fp.read(), "new")
+
     # TODO: support other platforms
     @unittest.skipIf(sys.platform != "linux", "not linux")
     def test_block_call(self):

From 05bf470ce9a8de17d8dda022ac60915cc565026e Mon Sep 17 00:00:00 2001
From: njzjz-bot <njzjz.bot@gmail.com>
Date: Sun, 30 Aug 2026 01:32:37 +0800
Subject: [PATCH 2/2] chore: annotate local copy helper

Document the helper's string paths and None return type with Python 3.7-compatible annotations.

Coding-Agent: Codex

Codex-Version: codex-cli 0.151.0

Model: gpt-5.6-sol

Reasoning-Effort: xhigh
---
 dpdispatcher/contexts/local_context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dpdispatcher/contexts/local_context.py b/dpdispatcher/contexts/local_context.py
index 55c7cd54..9e77a21c 100644
--- a/dpdispatcher/contexts/local_context.py
+++ b/dpdispatcher/contexts/local_context.py
@@ -88,7 +88,7 @@ def bind_submission(self, submission):
             self.temp_remote_root, submission.submission_hash
         )
 
-    def _copy_from_local_to_remote(self, local_path, remote_path):
+    def _copy_from_local_to_remote(self, local_path: str, remote_path: str) -> None:
         if not os.path.exists(local_path):
             raise FileNotFoundError(
                 f"cannot find uploaded file {os.path.join(local_path)}"