auto

solver.py

@@ -8,14 +8,12 @@ import time
 import shutil
 import subprocess
 import threading
-import zipfile
 import urllib.request
 from datetime import datetime, timezone
 
 # Solver source location
 SOLVER_SRC = "/app/solver"
 WORKSPACE_BASE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "workspaces")
-DEFAULT_TIMEOUT = int(os.environ.get("SOLVER_TIMEOUT", "600"))
 DEFAULT_MODEL = os.environ.get("SOLVER_MODEL", "qwen3.6-plus")
 DEFAULT_SOLVER_URL = os.environ.get(
     "SOLVER_REPO_URL",
@@ -48,7 +46,6 @@ def _now():
 def fetch_solver_files(repo_url):
     """Download solver files from GitHub raw URL into /app/solver/."""
     os.makedirs(SOLVER_SRC, exist_ok=True)
-    # Clean existing files
     for name in ("run.py", "spawn.py", "outline.md", "config.json"):
         p = os.path.join(SOLVER_SRC, name)
         if os.path.exists(p):
@@ -133,7 +130,7 @@ def submit_task(problem_text, name=None):
 
         print(f"[SUBMIT] Created task {task_id} -> {workspace}", flush=True)
 
-        # Spawn background thread (no capacity limit)
+        # Spawn background thread — run.py manages its own timeout & concurrency
         t = threading.Thread(target=_run_solver, args=(task_id, workspace), daemon=True)
         t.start()
         print(f"[SUBMIT] Thread started", flush=True)
@@ -152,7 +149,7 @@ def _run_solver(task_id, workspace):
         tasks[task_id].update({"status": "running", "started_at": _now()})
 
     _log(task_id, f"Starting solver in {workspace}")
-    _log(task_id, f"Model: {DEFAULT_MODEL}, Timeout: {DEFAULT_TIMEOUT}s")
+    _log(task_id, f"Model: {DEFAULT_MODEL}")
     _log(task_id, f"ANTHROPIC_API_KEY: {'set' if os.environ.get('ANTHROPIC_API_KEY') else 'NOT SET'}")
     _log(task_id, f"ANTHROPIC_BASE_URL: {os.environ.get('ANTHROPIC_BASE_URL', '(default)')}")
 
@@ -184,21 +181,9 @@ def _run_solver(task_id, workspace):
         reader = threading.Thread(target=_read_output, daemon=True)
         reader.start()
 
-        # Monitor workspace for progress
+        # Monitor workspace for progress (no timeout — run.py handles its own)
         last_phase = "starting"
         while proc.poll() is None:
-            elapsed = time.time() - start
-            if elapsed > DEFAULT_TIMEOUT:
-                proc.kill()
-                _log(task_id, f"TIMEOUT after {elapsed:.0f}s")
-                with tasks_lock:
-                    tasks[task_id].update({
-                        "status": "error",
-                        "error": f"Timeout after {elapsed:.0f}s",
-                        "finished_at": _now(),
-                    })
-                return
-
             phase = _infer_phase(workspace)
             if phase != last_phase:
                 _log(task_id, f"Phase: {phase}")
@@ -206,7 +191,7 @@ def _run_solver(task_id, workspace):
 
             with tasks_lock:
                 tasks[task_id]["phase"] = phase
-                tasks[task_id]["elapsed_s"] = round(elapsed)
+                tasks[task_id]["elapsed_s"] = round(time.time() - start)
 
             time.sleep(2)
 
@@ -264,12 +249,13 @@ def _run_solver(task_id, workspace):
 
 
 def _check_files(workspace):
-    """Return list of completed steps based on workspace files."""
-    steps = ["plan", "solution", "review", "final_summary"]
+    """Return list of completed steps based on workspace .md files (excluding problem.md)."""
     done = []
-    for s in steps:
-        if os.path.exists(os.path.join(workspace, f"{s}.md")):
-            done.append(s)
+    if not os.path.isdir(workspace):
+        return done
+    for fname in sorted(os.listdir(workspace)):
+        if fname.endswith(".md") and fname != "problem.md":
+            done.append(fname[:-3])  # strip .md
     return done
 
 
@@ -322,6 +308,23 @@ def get_task_logs(task_id, lines=100):
         return [f"Error reading log: {e}"]
 
 
+def get_running_tasks():
+    """Return list of currently running tasks (for frontend recovery after page refresh)."""
+    with tasks_lock:
+        return [
+            {
+                "task_id": t["task_id"],
+                "status": t["status"],
+                "phase": t["phase"],
+                "problem": t["problem"],
+                "created_at": t["created_at"],
+                "files_done": _check_files(t["workspace"]),
+            }
+            for t in tasks.values()
+            if t["status"] in ("pending", "running")
+        ]
+
+
 def list_tasks():
     with tasks_lock:
         return [

static/solver.html

@@ -275,18 +275,14 @@
     }
 
     // Task list
-    const FILE_STEPS = ['plan', 'solution', 'review', 'final_summary'];
-
     function renderTaskProgress(filesDone, status) {
-      return FILE_STEPS.map(f => {
-        let cls = '';
-        if (filesDone.includes(f)) {
-          cls = 'done';
-        } else if (status === 'running') {
-          cls = 'current';
-        }
-        return `<span class="task-file-step ${cls}">${f}</span>`;
-      }).join('');
+      const steps = filesDone.map(f =>
+        `<span class="task-file-step done">${f}</span>`
+      );
+      if (status === 'running' || status === 'pending') {
+        steps.push(`<span class="task-file-step current">running…</span>`);
+      }
+      return steps.join('');
     }
 
     async function loadTasks() {