Merge pull request #39 from XSpoonAi/fix/chat_attachment

Fix: Harden sandbox chat attachments, session history, and stream lifecycle

Author: joeqian10

spoon_bot/agent/context.py

@@ -8,6 +8,8 @@
 from pathlib import Path
 from typing import Any
 
+from loguru import logger
+
 
 class ContextBuilder:
     """
@@ -18,6 +20,7 @@ class ContextBuilder:
     """
 
     BOOTSTRAP_FILES = ["AGENTS.md", "SOUL.md", "USER.md", "TOOLS.md"]
+    SANDBOX_WORKSPACE_ROOT = "/workspace"
 
     def __init__(self, workspace: Path):
         """
@@ -199,24 +202,61 @@ def _build_user_content(
             return text
 
         images = []
+        skipped: list[str] = []
         for path in media:
-            p = Path(path)
+            p = self._resolve_media_path(path)
             mime, _ = mimetypes.guess_type(path)
-            if not p.is_file() or not mime or not mime.startswith("image/"):
+            if p is None or not p.is_file():
+                skipped.append(f"{path}: missing file")
+                continue
+            if not mime or not mime.startswith("image/"):
+                skipped.append(f"{path}: unsupported mime {mime or 'unknown'}")
                 continue
             try:
                 b64 = base64.b64encode(p.read_bytes()).decode()
                 images.append({
                     "type": "image_url",
                     "image_url": {"url": f"data:{mime};base64,{b64}"}
                 })
-            except Exception:
-                pass
+            except Exception as exc:
+                skipped.append(f"{path}: {exc}")
+
+        if skipped:
+            logger.warning(
+                "Skipped media inputs while building multimodal content: {}",
+                "; ".join(skipped),
+            )
 
         if not images:
             return text
         return images + [{"type": "text", "text": text}]
 
+    def _resolve_media_path(self, path: str) -> Path | None:
+        """Resolve runtime media refs, including /workspace aliases and workspace-relative paths."""
+        candidate = str(path or "").strip()
+        if not candidate:
+            return None
+
+        sandbox_root = self.SANDBOX_WORKSPACE_ROOT.rstrip("/")
+        workspace_root_str = self.workspace.as_posix().rstrip("/")
+        try:
+            if candidate.startswith("/"):
+                normalized = Path(candidate).as_posix()
+                if normalized == sandbox_root or normalized.startswith(sandbox_root + "/"):
+                    relative = normalized[len(sandbox_root):].lstrip("/")
+                    resolved = (self.workspace / relative).resolve(strict=True)
+                elif normalized == workspace_root_str or normalized.startswith(workspace_root_str + "/"):
+                    relative = normalized[len(workspace_root_str):].lstrip("/")
+                    resolved = (self.workspace / relative).resolve(strict=True)
+                else:
+                    resolved = Path(candidate).expanduser().resolve(strict=True)
+            else:
+                resolved = (self.workspace / candidate).resolve(strict=True)
+        except (FileNotFoundError, OSError):
+            return None
+
+        return resolved if resolved.is_file() else None
+
     def add_tool_result(
         self,
         messages: list[dict[str, Any]],