fix: cookie SameSite for HF proxy, Jobs truncation, Integrations timeout

emergent2api/backends/integrations.py

@@ -43,7 +43,7 @@ class IntegrationsBackend(EmergentBackend):
         try:
             async with httpx.AsyncClient(
                 transport=transport,
-                timeout=httpx.Timeout(120.0, connect=15.0),
+                timeout=httpx.Timeout(180.0, connect=30.0),
             ) as client:
                 if stream:
                     async with client.stream(

emergent2api/backends/jobs.py

@@ -63,9 +63,10 @@ class JobsBackend(EmergentBackend):
         consecutive_unchanged = 0
         confirmed_end = False
         has_received_anything = False
-        max_wait_cycles = 400
+        job_completed = False
+        max_wait_cycles = 600
+        start_time = time.time()
 
-        # Initial wait to let the container spin up
         await asyncio.sleep(8.0)
 
         for _ in range(max_wait_cycles):
@@ -77,7 +78,12 @@ class JobsBackend(EmergentBackend):
 
             data_items = result.get("data", [])
 
-            # Find the longest text across all items (main content)
+            # Check for explicit completion signal in trajectory items
+            for item in data_items:
+                status = (item.get("traj_payload") or {}).get("status", "")
+                if status in ("completed", "done", "finished"):
+                    job_completed = True
+
             current_full_text = ""
             current_thinking = ""
             for item in data_items:
@@ -89,14 +95,12 @@ class JobsBackend(EmergentBackend):
                 if reasoning and len(reasoning) > len(current_thinking):
                     current_thinking = reasoning
 
-            # Yield thinking delta
             if current_thinking and len(current_thinking) > len(full_thinking):
                 delta = current_thinking[len(full_thinking):]
                 full_thinking = current_thinking
                 if stream and delta:
                     yield {"type": "thinking", "content": delta}
 
-            # Yield text delta
             if len(current_full_text) > len(full_text):
                 delta = current_full_text[len(full_text):]
                 full_text = current_full_text
@@ -108,17 +112,26 @@ class JobsBackend(EmergentBackend):
             else:
                 consecutive_unchanged += 1
 
-                if has_received_anything and full_text and consecutive_unchanged >= 6:
+                if job_completed and has_received_anything:
+                    logger.info("Stream completed (job status=completed)")
+                    break
+
+                # Require more stability cycles and longer confirmation for complex queries
+                stable_threshold = 15 if len(full_text) < 500 else 10
+                if has_received_anything and full_text and consecutive_unchanged >= stable_threshold:
                     if not confirmed_end:
                         logger.debug("Content stable, confirming end...")
                         confirmed_end = True
-                        await asyncio.sleep(5.0)
+                        await asyncio.sleep(8.0)
                         continue
                     logger.info("Stream completed (double-confirmed stable)")
                     break
 
             await self._dynamic_sleep(consecutive_unchanged)
 
+        elapsed = time.time() - start_time
+        logger.info(f"Job finished: {len(full_text)} chars in {elapsed:.1f}s")
+
         if not has_received_anything:
             logger.warning("Stream finished with NO content")
 

emergent2api/routes/admin.py

@@ -50,7 +50,10 @@ async def login(request: Request):
     token = secrets.token_urlsafe(32)
     _sessions.add(token)
     resp = JSONResponse(content={"ok": True})
-    resp.set_cookie(COOKIE_NAME, token, httponly=True, samesite="lax", max_age=86400 * 7)
+    resp.set_cookie(
+        COOKIE_NAME, token, httponly=True, samesite="none",
+        secure=True, max_age=86400 * 7, path="/",
+    )
     return resp