Update app.py

app.py

@@ -106,7 +106,7 @@ def generate_filename(content, username, extension):
 def initialize_history_file():
     ensure_dir(SAVED_WORLDS_DIR)
     if not os.path.exists(WORLD_STATE_FILE):
-        initial_state = {"objects": {}, "players": {}, "action_history": []}
+        initial_state = {"objects": {}, "players": {}, "action_history": [], "selected_object": "None"}
         with open(WORLD_STATE_FILE, 'w', encoding='utf-8') as f:
             json.dump(initial_state, f, indent=2)
 
@@ -115,14 +115,14 @@ def read_history_file():
     try:
         with open(WORLD_STATE_FILE, 'r', encoding='utf-8') as f:
             state = json.load(f)
-            # Ensure all expected keys exist
             state.setdefault("objects", {})
             state.setdefault("players", {})
             state.setdefault("action_history", [])
+            state.setdefault("selected_object", "None")
             return state
     except Exception as e:
         print(f"Error reading history file: {e}")
-        return {"objects": {}, "players": {}, "action_history": []}
+        return {"objects": {}, "players": {}, "action_history": [], "selected_object": "None"}
 
 def write_history_file(state):
     with state_lock:
@@ -273,7 +273,7 @@ async def save_and_log_chat(username, message, voice):
     update_action_history(username, "chat", {"message": message}, state)
     return md_file_path, audio_file
 
-# 💾 Save World State: Saves current state to a named file
+# 💾 Save World State: Saves current state including selected tool
 def save_world_state(world_name):
     if not world_name.strip():
         st.error("World name cannot be empty.")
@@ -284,6 +284,7 @@ def save_world_state(world_name):
     save_path = os.path.join(SAVED_WORLDS_DIR, filename)
     
     state = read_history_file()
+    state["selected_object"] = st.session_state.selected_object
     try:
         with open(save_path, 'w', encoding='utf-8') as f:
             json.dump(state, f, indent=2)
@@ -295,7 +296,7 @@ def save_world_state(world_name):
         st.error(f"Failed to save world: {e}")
         return False
 
-# 📂 Load World State: Loads a saved state from a file
+# 📂 Load World State: Loads a saved state including selected tool
 def load_world_state(filename):
     load_path = os.path.join(SAVED_WORLDS_DIR, filename)
     if not os.path.exists(load_path):
@@ -307,9 +308,11 @@ def load_world_state(filename):
         state.setdefault("objects", {})
         state.setdefault("players", {})
         state.setdefault("action_history", [])
+        state.setdefault("selected_object", "None")
         write_history_file(state)
         st.session_state.world_state = state
         st.session_state.action_history = state["action_history"]
+        st.session_state.selected_object = state["selected_object"]
         print(f"Loaded world state from {load_path}")
         st.success(f"Loaded world {filename}")
         st.rerun()
@@ -336,6 +339,7 @@ def handle_js_messages():
             action = data.get("type")
             payload = data.get("payload", {})
             username = payload.get("username", st.session_state.username)
+            state = read_history_file()
             if action == "place_object":
                 state = persist_world_objects(payload["object_data"], username, "place")
                 st.session_state.world_state = state
@@ -348,6 +352,14 @@ def handle_js_messages():
                 state = update_player_state(username, payload["position"])
                 st.session_state.world_state = state
                 st.rerun()
+            elif action == "tool_change":
+                tool = payload.get("tool", "None")
+                state["selected_object"] = tool
+                st.session_state.selected_object = tool
+                write_history_file(state)
+                update_action_history(username, "tool_change", {"tool": tool}, state)
+                st.session_state.world_state = state
+                st.rerun()
         except json.JSONDecodeError:
             print(f"Invalid JS message: {message}")
         except Exception as e:
@@ -385,10 +397,10 @@ def init_session_state():
         'username': None,
         'autosend': False,
         'last_message': "",
-        'selected_object': 'None',
+        'selected_object': "None",
         'paste_image_base64': "",
         'new_world_name': "MyWorld",
-        'world_state': {"objects": {}, "players": {}, "action_history": []}
+        'world_state': {"objects": {}, "players": {}, "action_history": [], "selected_object": "None"}
     }
     for k, v in defaults.items():
         if k not in st.session_state:
@@ -408,6 +420,7 @@ def init_session_state():
     state = read_history_file()
     st.session_state.world_state = state
     st.session_state.action_history = state.get("action_history", [])
+    st.session_state.selected_object = state.get("selected_object", "None")
     update_player_state(st.session_state.username)
 
 # ==============================================================================
@@ -718,8 +731,8 @@ def render_sidebar():
                     "Time": entry["timestamp"],
                     "Player": entry["username"],
                     "Action": entry["action"].capitalize(),
-                    "Object Type": data.get("type", "N/A"),
-                    "Position": position_str
+                    "Type": data.get("type", "N/A"),
+                    "Details": position_str
                 })
             elif entry["action"] == "move":
                 pos = data.get("position", {})
@@ -728,16 +741,33 @@ def render_sidebar():
                     "Time": entry["timestamp"],
                     "Player": entry["username"],
                     "Action": "Move",
-                    "Object Type": "Player",
-                    "Position": position_str
+                    "Type": "Player",
+                    "Details": position_str
                 })
             elif entry["action"] == "chat":
                 history_data.append({
                     "Time": entry["timestamp"],
                     "Player": entry["username"],
                     "Action": "Chat",
-                    "Object Type": "Message",
-                    "Position": data.get("message", "N/A")[:50]
+                    "Type": "Message",
+                    "Details": data.get("message", "N/A")[:50]
+                })
+            elif entry["action"] == "tool_change":
+                tool = data.get("tool", "None")
+                history_data.append({
+                    "Time": entry["timestamp"],
+                    "Player": entry["username"],
+                    "Action": "Tool Change",
+                    "Type": "Tool",
+                    "Details": f"Selected {tool}"
+                })
+            elif entry["action"] == "rename":
+                history_data.append({
+                    "Time": entry["timestamp"],
+                    "Player": entry["username"],
+                    "Action": "Rename",
+                    "Type": "Username",
+                    "Details": f"From {data.get('old_username')} to {data.get('new_username')}"
                 })
         if history_data:
             st.dataframe(pd.DataFrame(history_data), height=200, use_container_width=True)
@@ -798,16 +828,20 @@ def render_sidebar():
             if cols[col_idx % 5].button(emoji, key=button_key, help=name, type=button_type, use_container_width=True):
                 if st.session_state.selected_object != name:
                     st.session_state.selected_object = name
-                    update_player_state(st.session_state.username)
-                    update_action_history(st.session_state.username, "tool_change", {"tool": name}, read_history_file())
+                    state = read_history_file()
+                    state["selected_object"] = name
+                    write_history_file(state)
+                    update_action_history(st.session_state.username, "tool_change", {"tool": name}, state)
                     st.rerun()
             col_idx += 1
         st.markdown("---")
         if st.button("🚫 Clear Tool", key="clear_tool", use_container_width=True):
             if st.session_state.selected_object != 'None':
                 st.session_state.selected_object = 'None'
-                update_player_state(st.session_state.username)
-                update_action_history(st.session_state.username, "tool_change", {"tool": "None"}, read_history_file())
+                state = read_history_file()
+                state["selected_object"] = "None"
+                write_history_file(state)
+                update_action_history(st.session_state.username, "tool_change", {"tool": "None"}, state)
                 st.rerun()
 
         st.markdown("---")
@@ -843,6 +877,7 @@ def render_main_content():
         st.header("Shared 3D World")
         st.caption("Click to place objects with the selected tool, or click to move player. Right-click to delete. State is saved in history.json.")
         state = st.session_state.world_state
+        state["selected_object"] = st.session_state.selected_object
         html_file_path = 'index.html'
         try:
             with open(html_file_path, 'r', encoding='utf-8') as f:
@@ -895,10 +930,11 @@ def render_main_content():
         st.header("📂 Files & Settings")
         st.subheader("💾 World State Management")
         if st.button("Clear World State", key="clear_world_state"):
-            state = {"objects": {}, "players": {}, "action_history": []}
+            state = {"objects": {}, "players": {}, "action_history": [], "selected_object": "None"}
             write_history_file(state)
             st.session_state.world_state = state
             st.session_state.action_history = []
+            st.session_state.selected_object = "None"
             st.success("World state cleared!")
             st.rerun()