Merge branch 'main' of github.com:emagedoc/CodeClash

Author: john-b-yang

.cursor/rules/viewer.mdc

@@ -377,7 +377,7 @@ The application has two main pages:
   - **game.log**: Game-specific logging
   - **everything.log**: Combined comprehensive logging
   - **players/p1/player.log, players/p2/player.log**: Individual player logs for each player
-  - Each log foldout includes a "Copy path" button and has its own scroll container with max-height of 500px for large logs
+  - Each log foldout includes "Copy path" and "Download" buttons and has its own scroll container with max-height of 500px for large logs
   - Logs are displayed in a dedicated section with proper styling and scrollbars
 
 #### Analysis Section
@@ -482,6 +482,31 @@ The trajectory template displays:
 
 **Content Preview**: Long message content (>5 lines) shows a preview with expand/collapse functionality to keep the interface manageable.
 
+## Download Functionality
+
+The trajectory viewer provides download capabilities for all files that have "Copy path" buttons (except the current folder path):
+
+### Download Locations
+
+* **Tournament and Game Logs**: All log files in the Overview section (tournament.log, game.log, everything.log, player logs)
+* **Metadata Files**: The metadata.json file in the Setup section
+* **Trajectory Files**: Individual trajectory files (.traj.json) in the Rounds section
+
+### Implementation Details
+
+* **Download Buttons**: Each "Copy path" button (except current folder) is accompanied by a "Download" button with a download icon
+* **Server Endpoint**: `GET /download-file?path=<file_path>` serves files with proper security checks
+* **Security**: Files must exist within the logs directory, be actual files (not directories), and be accessible
+* **File Naming**: Downloaded files retain their original names
+* **JavaScript**: Download functionality is handled by `downloadFile()` function in `clipboard.js`
+* **User Feedback**: Download buttons show success/error states similar to copy buttons
+
+### Button Styling
+
+* **Download buttons** use the same styling as copy buttons but with download icon (`bi-download`)
+* **Button classes**: `.download-btn` and `.download-btn-small` for consistent styling
+* **Placement**: Download buttons appear immediately after their corresponding copy path buttons
+
 ## Multi-Select Actions Specification
 
 The game picker includes four batch operations for selected game folders, accessible via the action dropdown:

.gitignore

@@ -1,6 +1,9 @@
 # Project specific
 
+.vscode/**
+*.ipynb
 *.traj.json
+logs/**
 
 # -------------
 
@@ -212,5 +215,5 @@ marimo/_static/
 marimo/_lsp/
 __marimo__/
 
-# Custom
-logs/
+
+# >>>>>>>>> CUSTOM THINGS ON TOP OF FILE <<<<<<<<<

aws/run_job.py

@@ -58,11 +58,8 @@ def get_latest_job_definition_arn(self) -> str:
     def submit_job(self, command: list[str], job_name: str | None = None) -> str:
         """Submit a job to AWS Batch."""
         if job_name is None:
-            # Generate a job name based on command and timestamp
-            cmd_name = command[0] if command else "job"
-            cmd_name = "".join(letter.lower() for letter in cmd_name if letter.isalpha())
             timestamp = int(time.time())
-            job_name = f"codeclash-{cmd_name}-{timestamp}"
+            job_name = f"codeclash-{timestamp}"
 
         # Get current git branch and prepend it to the command
         current_branch = get_current_git_branch()
@@ -148,7 +145,7 @@ def main():
         description="Submit jobs to AWS Batch",
         formatter_class=argparse.RawDescriptionHelpFormatter,
     )
-    parser.add_argument("--job-name", help="Custom job name (auto-generated if not specified)")
+    parser.add_argument("-n", "--job-name", help="Custom job name (auto-generated if not specified)")
     parser.add_argument(
         "--job-definition", default="codeclash-default-job", help="Job definition name (default: codeclash-default-job)"
     )

aws/setup/batch/environment.json

@@ -1,21 +1,20 @@
 {
   "computeEnvironmentName": "codeclash-batch",
   "computeEnvironmentArn": "arn:aws:batch:us-east-1:039984708918:compute-environment/codeclash-batch",
-  "ecsClusterArn": "arn:aws:ecs:us-east-1:039984708918:cluster/AWSBatch-codeclash-batch-1561352c-9234-3de1-999a-dcd1c9989b32",
+  "ecsClusterArn": "arn:aws:ecs:us-east-1:039984708918:cluster/AWSBatch-codeclash-batch-a9d4e10e-95a6-327b-ad6e-67ea5235e964",
   "tags": {
     "project": "codeclash",
     "author": "kilian"
   },
   "type": "MANAGED",
   "state": "ENABLED",
-  "status": "VALID",
   "statusReason": "ComputeEnvironment Healthy",
   "computeResources": {
     "type": "EC2",
     "allocationStrategy": "BEST_FIT_PROGRESSIVE",
-    "minvCpus": 2,
-    "maxvCpus": 16,
-    "desiredvCpus": 2,
+    "minvCpus": 0,
+    "maxvCpus": 32,
+    "desiredvCpus": 0,
     "instanceTypes": [
       "optimal"
     ],
@@ -31,9 +30,11 @@
       "sg-014723b4566a8214d"
     ],
     "instanceRole": "arn:aws:iam::039984708918:instance-profile/kilian-codeclash-ecsInstanceRole",
+    "tags": {},
     "launchTemplate": {
       "launchTemplateName": "kilian-codeclash-launch-template",
-      "version": "$Latest"
+      "version": "$Latest",
+      "overrides": []
     },
     "ec2Configuration": [
       {
@@ -46,6 +47,5 @@
     "terminateJobsOnUpdate": false,
     "jobExecutionTimeoutMinutes": 30
   },
-  "containerOrchestrationType": "ECS",
-  "uuid": "f413880a-eecc-3dfd-b139-0e9143381b4d"
+  "uuid": "5246d4a1-4dd8-397e-82c2-af986d0f7a87"
 }

aws/setup/batch/iam-ebs.json

@@ -30,7 +30,7 @@
       }
     ],
     "RoleLastUsed": {
-      "LastUsedDate": "2025-09-25 19:28:45+00:00",
+      "LastUsedDate": "2025-09-26 20:48:55+00:00",
       "Region": "us-east-1"
     }
   }

aws/setup/batch/iam-environment-role.json

@@ -31,7 +31,7 @@
       }
     ],
     "RoleLastUsed": {
-      "LastUsedDate": "2025-09-25 19:02:55+00:00",
+      "LastUsedDate": "2025-09-26 20:51:10+00:00",
       "Region": "us-east-1"
     }
   }

aws/setup/batch/iam-execution-role.json

@@ -31,7 +31,7 @@
       }
     ],
     "RoleLastUsed": {
-      "LastUsedDate": "2025-09-25 19:02:58+00:00",
+      "LastUsedDate": "2025-09-26 20:49:00+00:00",
       "Region": "us-east-1"
     }
   }

aws/setup/batch/iam-job-role.json

@@ -1,8 +1,5 @@
 {
   "jobDefinitionName": "codeclash-default-job",
-  "jobDefinitionArn": "arn:aws:batch:us-east-1:039984708918:job-definition/codeclash-default-job:1",
-  "revision": 1,
-  "status": "ACTIVE",
   "type": "container",
   "parameters": {},
   "containerProperties": {
@@ -31,11 +28,15 @@
     "secrets": [
       {
         "name": "GITHUB_TOKEN",
-        "valueFrom": "arn:aws:secretsmanager:us-east-1:039984708918:secret:kilian-codeclash-github-key-LIkSby:GITHUB_KEY::"
+        "valueFrom": "arn:aws:secretsmanager:us-east-1:039984708918:secret:kilian-codeclash-keys-CTX9UJ:GITHUB_TOKEN::"
       },
       {
-        "name": "OPENAI_API_KEY",
-        "valueFrom": "arn:aws:secretsmanager:us-east-1:039984708918:secret:kilian-codeclash-github-key-LIkSby:OPENAI_API_KEY::"
+        "name": "PORTKEY_API_KEY",
+        "valueFrom": "arn:aws:secretsmanager:us-east-1:039984708918:secret:kilian-codeclash-keys-CTX9UJ:PORTKEY_API_KEY::"
+      },
+      {
+        "name": "ANTHROPIC_API_KEY",
+        "valueFrom": "arn:aws:secretsmanager:us-east-1:039984708918:secret:kilian-codeclash-keys-CTX9UJ:ANTHROPIC_API_KEY::"
       }
     ]
   },
@@ -45,6 +46,5 @@
   },
   "platformCapabilities": [
     "EC2"
-  ],
-  "containerOrchestrationType": "ECS"
+  ]
 }

aws/setup/batch/job_definition.json

@@ -2,7 +2,6 @@
   "jobQueueName": "codeclash-queue",
   "jobQueueArn": "arn:aws:batch:us-east-1:039984708918:job-queue/codeclash-queue",
   "state": "ENABLED",
-  "status": "VALID",
   "statusReason": "JobQueue Healthy",
   "priority": 1,
   "computeEnvironmentOrder": [