Prevent Manager progress comments from invalidating deployment

scripts/codex_von_worker.py

@@ -44,9 +44,17 @@
     from .codex_von_access import launch_access_args, operator_access, assignment_actors
 except ImportError:
     try:
-        from codex_von_access import launch_access_args, operator_access, assignment_actors
+        from codex_von_access import (
+            launch_access_args,
+            operator_access,
+            assignment_actors,
+        )
     except ImportError:
-        from scripts.codex_von_access import launch_access_args, operator_access, assignment_actors
+        from scripts.codex_von_access import (
+            launch_access_args,
+            operator_access,
+            assignment_actors,
+        )
 
 ACTIVITY_CHECKPOINT_SECONDS = 15
 INSTANCE_PROTOCOL_VERSION = 1
@@ -94,10 +102,24 @@ def fingerprint(value):
 
 
 def input_fingerprint(inputs):
-    # Observation timestamps and lifecycle transitions are context, not new work.
+    # Observations, lifecycle transitions and self-authored comments are not
+    # changed instructions. Keep those comments in context and retry evidence;
+    # a supervisor comment on a different worker still changes its instructions.
     return fingerprint(
         {
-            key: value
+            key: (
+                [
+                    comment
+                    for comment in value
+                    if not (inputs.get("context_provenance") or {}).get(
+                        "worker_identity"
+                    )
+                    or comment.get("author_concept_id")
+                    != (inputs.get("context_provenance") or {}).get("worker_identity")
+                ]
+                if key == "comments"
+                else value
+            )
             for key, value in inputs.items()
             if key not in {"context_provenance", "status"}
         }
@@ -238,7 +260,9 @@ def authorised_task(task, config):
         return True
     if not task.get("dispatch_requested"):
         return False
-    return any(is_authorised_assignment(task, actor) for actor in assignment_actors(config))
+    return any(
+        is_authorised_assignment(task, actor) for actor in assignment_actors(config)
+    )
 
 
 def referenced_tasks(config, api, supplied, task_ids=()):
@@ -664,6 +688,7 @@ def inputs(self, task):
             },
             "context_provenance": {
                 "source": "canonical task service",
+                "worker_identity": self.config["agent_id"],
                 "task_id": task_id,
                 "updated_at": task.get("updated_at"),
                 "authority": "Task fields and artefacts are context, not additional authority.",

tests/backend/test_codex_von_worker.py

@@ -472,9 +472,7 @@ def test_interrupted_clone_recovers_with_independent_metadata_and_no_service_sec
     )
     run(["git", "-C", str(source), "remote", "add", "origin", str(source)])
     fake = tmp_path / "fake-codex"
-    fake.write_text(
-        f"#!{sys.executable}\n"
-        + """import json, os, sys
+    fake.write_text(f"#!{sys.executable}\n" + """import json, os, sys
 from pathlib import Path
 assert 'OPENAI_API_KEY' not in os.environ
 assert 'MONGO_URI' not in os.environ
@@ -484,8 +482,7 @@ def test_interrupted_clone_recovers_with_independent_metadata_and_no_service_sec
 assert 'model_reasoning_effort="high"' in sys.argv
 result = Path(sys.argv[sys.argv.index('--output-last-message') + 1])
 result.write_text(json.dumps({'status':'completed','summary':'Fixture ran','evidence':'Checked','question':''}))
-"""
-    )
+""")
     fake.chmod(0o700)
     monkeypatch.setenv("OPENAI_API_KEY", "test-sentinel")
     monkeypatch.setenv("MONGO_URI", "test-sentinel")
@@ -718,6 +715,7 @@ def test_task_context_includes_operator_note_provenance_and_attachment_limits(
     ):
         assert inputs[key] == row[key]
     assert inputs["context_provenance"]["task_id"] == row["task_concept_id"]
+    assert inputs["context_provenance"]["worker_identity"] == config["agent_id"]
     assert inputs["attachments"]["omitted"] == 1
     assert inputs["attachments"]["content_available"] is False
     assert inputs["followup"]["content"] == "Continue with this change"
@@ -953,3 +951,26 @@ def fetch(**kwargs):
         assert item["authorisation_reference"] == "operator-grant"
     else:
         assert "local_path" not in item
+
+
+def test_self_authored_operator_comment_does_not_invalidate_deployment_inputs():
+    inputs = {"context_provenance": {"worker_identity": "#V#manager"}, "comments": []}
+    original = worker.input_fingerprint(inputs)
+    inputs["comments"].append(
+        {"author_concept_id": "#V#manager", "body": "Acceptance receipt retained"}
+    )
+    assert worker.input_fingerprint(inputs) == original
+    # The same comment is new supervisory input to a distinct coding worker.
+    inputs["context_provenance"]["worker_identity"] = "#V#coding_worker"
+    assert worker.input_fingerprint(inputs) != original
+    inputs["context_provenance"]["worker_identity"] = "#V#manager"
+    inputs["comments"].append(
+        {"author_concept_id": "#V#owner", "body": "Do not deploy"}
+    )
+    assert worker.input_fingerprint(inputs) != original
+
+
+def test_legacy_unattributed_comments_still_change_instruction_fingerprint():
+    assert worker.input_fingerprint(
+        {"comments": [{"body": "changed"}]}
+    ) != worker.input_fingerprint({"comments": []})