Merge pull request #174 from EvanProgramming/codex/issue-168-project-scope

fix: isolate interaction state by project scope

Author: EvanProgramming

main.py

@@ -2748,16 +2748,25 @@ def interaction_envelope(user_input: str = "") -> dict[str, Any]:
     return _interaction_controller.envelope(user_input)
 
 
+def interaction_workspace_id(context: LaunchContext | None = None) -> str:
+    """Keep project interaction state separate without splitting global memory."""
+    active = context if context is not None else _launch_context
+    if isinstance(active, LaunchContext) and not active.is_global:
+        return active.source_scope_id
+    return memory_bank.workspace_id
+
+
 def bind_interaction_scope(session_id: str, *, user_id: str | None = None) -> None:
     """Bind the shared task and interaction facades to one local surface."""
     global tasks, _interaction_controller
     owner = user_id or memory_bank.user_id
+    workspace_id = interaction_workspace_id()
     tasks = TaskManager(
-        memory_bank.store, workspace_id=memory_bank.workspace_id,
+        memory_bank.store, workspace_id=workspace_id,
         session_id=session_id, user_id=owner,
     )
     _interaction_controller = InteractionController(
-        memory_bank.store, user_id=owner, workspace_id=memory_bank.workspace_id,
+        memory_bank.store, user_id=owner, workspace_id=workspace_id,
         session_id=session_id,
     )
     _restore_ponytail_level()

server.py

@@ -218,7 +218,7 @@ def _task_manager(session_id: str | None) -> TaskManager:
     """Build a task manager bound to the authenticated deployment scope."""
     return TaskManager(
         _agent.memory_bank.store,
-        workspace_id=_agent.memory_bank.workspace_id,
+        workspace_id=_agent.interaction_workspace_id(),
         session_id=session_id,
         user_id=_SERVER_ACTOR_ID,
     )
@@ -369,7 +369,7 @@ def _get_or_create_session(session_id: str, user_id: str = "anonymous") -> dict:
 def _interaction_for_session(session: dict[str, Any]):
     return _agent.InteractionController(
         _agent.memory_bank.store, user_id=session.get("user_id", _SERVER_ACTOR_ID),
-        workspace_id=_agent.memory_bank.workspace_id, session_id=session["session_id"],
+        workspace_id=_agent.interaction_workspace_id(), session_id=session["session_id"],
     )
 
 
@@ -475,7 +475,7 @@ def _run_session_chat(session: dict[str, Any], message: str) -> str:
             _agent.TOOLS_LIST = _agent._build_tools_list()
             _agent.short_term_memory = list(session["messages"])
             _agent.tasks = TaskManager(
-                _agent.memory_bank.store, workspace_id=_agent.memory_bank.workspace_id,
+                _agent.memory_bank.store, workspace_id=_agent.interaction_workspace_id(),
                 session_id=session_id, user_id=session["user_id"],
             )
             _agent.tasks.recover()

tests/test_interaction.py

@@ -15,6 +15,7 @@
 )
 from task_engine import TaskManager
 from capability_tokens import issue_capability_token
+from workspace_context import resolve_launch_context
 
 
 class InteractionTests(unittest.TestCase):
@@ -36,6 +37,34 @@ def test_auto_routing_and_mode_capabilities_are_narrowing_only(self):
         self.assertEqual(mode_capabilities(base, "plan"), frozenset({"read", "network"}))
         self.assertEqual(mode_capabilities(frozenset({"read"}), "agent"), frozenset({"read"}))
 
+    def test_project_interaction_state_is_isolated_from_other_projects(self):
+        with tempfile.TemporaryDirectory() as home, tempfile.TemporaryDirectory() as first, \
+                tempfile.TemporaryDirectory() as second:
+            first_context = resolve_launch_context(home=home, project_path=first)
+            second_context = resolve_launch_context(home=home, project_path=second)
+            first_scope = main.interaction_workspace_id(first_context)
+            second_scope = main.interaction_workspace_id(second_context)
+            self.assertNotEqual(first_scope, second_scope)
+
+            first_controller = InteractionController(
+                self.store, workspace_id=first_scope, session_id="surface:tui",
+            )
+            first_controller.propose_plan({
+                "title": "First", "summary": "Only the first project.", "assumptions": [],
+                "steps": [{"id": "one", "title": "One", "description": "Change first.",
+                           "acceptance": ["First changed"]}],
+            })
+            second_controller = InteractionController(
+                self.store, workspace_id=second_scope, session_id="surface:tui",
+            )
+            self.assertIsNotNone(first_controller.state()["pending_plan"])
+            self.assertIsNone(second_controller.state()["pending_plan"])
+
+            global_context = resolve_launch_context(home=home, global_mode=True)
+            self.assertEqual(
+                main.interaction_workspace_id(global_context), main.memory_bank.workspace_id,
+            )
+
     def test_question_bounds_and_event_reconstruction(self):
         question = self.controller.request_question({"questions": [{
             "id": "scope", "header": "Scope", "prompt": "Which package?",