Fix: Update last_active_ts in dispatch method to prevent inactive sessions from persisting

docs/modules/usage/how-to/gitlab-runner.md

@@ -1 +0,0 @@
-# Using GitLab CI Runners

openhands/resolver/README.md

@@ -1,141 +1,191 @@
-# OpenHands GitHub & GitLab Issue Resolver 🙌
+# OpenHands Github & Gitlab Issue Resolver 🙌
 
-Need help resolving GitHub or GitLab issues? Let an AI agent help you out!
+Need help resolving a GitHub issue but don't have the time to do it yourself? Let an AI agent help you out!
 
-This tool uses [OpenHands](https://github.com/all-hands-ai/openhands) AI agents to automatically resolve issues in your repositories. It's designed to handle one issue at a time with high quality.
+This tool allows you to use open-source AI agents based on [OpenHands](https://github.com/all-hands-ai/openhands)
+to attempt to resolve GitHub issues automatically. While it can handle multiple issues, it's primarily designed
+to help you resolve one issue at a time with high quality.
 
-## 1. Setting Up for GitHub (Action Workflow)
+Getting started is simple - just follow the instructions below.
 
-### Prerequisites
+## Using the GitHub Actions Workflow
 
-- [Create a personal access token](https://github.com/settings/tokens?type=beta) with read/write scope for
+This repository includes a GitHub Actions workflow that can automatically attempt to fix individual issues labeled with 'fix-me'.
+Follow these steps to use this workflow in your own repository:
 
-  - "contents"
-  - "issues"
-  - "pull requests"
-  - "workflows"
+1. [Create a personal access token](https://github.com/settings/tokens?type=beta) with read/write scope for "contents", "issues", "pull requests", and "workflows"
 
-- Create an LLM API key (e,g [Claude API](https://www.anthropic.com/api))
+   Note: If you're working with an organizational repository, you may need to configure the organization's personal access token policy first. See [Setting a personal access token policy for your organization](https://docs.github.com/en/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization) for details.
 
-### Installation
+2. Create an API key for the [Claude API](https://www.anthropic.com/api) (recommended) or another supported LLM service
 
-1. Copy `examples/openhands-resolver.yml` to your repository's `.github/workflows/` directory
+3. Copy `examples/openhands-resolver.yml` to your repository's `.github/workflows/` directory
 
-2. Configure repository permissions:
+4. Configure repository permissions:
+    - Go to `Settings -> Actions -> General -> Workflow permissions`
+    - Select "Read and write permissions"
+    - Enable "Allow Github Actions to create and approve pull requests"
 
-   - Go to `Settings -> Actions -> General -> Workflow permissions`
-   - Select **Read and write permissions**
-   - Enable **Allow Github Actions to create and approve pull requests**
-
-   > If "Read and write permissions" is greyed out:
-   >
-   > - Check organization settings first
-   > - Otherwise, permissions might need to be set in [Enterprise policy settings](https://docs.github.com/en/enterprise-cloud@latest/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#enforcing-a-policy-for-workflow-permissions-in-your-enterprise)
-
-3. Set up [GitHub secrets](https://docs.github.com/en/actions/security-for-github-actions/security-guides/using-secrets-in-github-actions):
+    Note: If the "Read and write permissions" option is greyed out:
+    - First check if permissions need to be set at the organization level
+    - If still greyed out at the organization level, permissions need to be set in the [Enterprise policy settings](https://docs.github.com/en/enterprise-cloud@latest/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#enforcing-a-policy-for-workflow-permissions-in-your-enterprise)
 
+5. Set up [GitHub secrets](https://docs.github.com/en/actions/security-for-github-actions/security-guides/using-secrets-in-github-actions):
    - Required:
-     - `LLM_API_KEY`: Your LLM API key
+    - `LLM_API_KEY`: Your LLM API key
    - Optional:
      - `PAT_USERNAME`: GitHub username for the personal access token
      - `PAT_TOKEN`: The personal access token
      - `LLM_BASE_URL`: Base URL for LLM API (only if using a proxy)
-     - [See how to customize more configurations](https://docs.all-hands.dev/modules/usage/how-to/github-action#custom-configurations)
 
-## 2. Setting up GitLab (CI Runner)
+   Note: You can set these secrets at the organization level to use across multiple repositories.
 
-### Prerequisites
+6. Set up any [custom configurations required](https://docs.all-hands.dev/modules/usage/how-to/github-action#custom-configurations)
 
-Create a GitLab Personal Access Token with API, read/write access
+7. Usage:
+   There are two ways to trigger the OpenHands agent:
 
-### Installation
+   a. Using the 'fix-me' label:
+      - Add the 'fix-me' label to any issue you want the AI to resolve
+      - The agent will consider all comments in the issue thread when resolving
+      - The workflow will:
+        1. Attempt to resolve the issue using OpenHands
+        2. Create a draft PR if successful, or push a branch if unsuccessful
+        3. Comment on the issue with the results
+        4. Remove the 'fix-me' label once processed
 
-## 3. Triggering OpenHands Agent
+   b. Using `@openhands-agent` mention:
+      - Create a new comment containing `@openhands-agent` in any issue
+      - The agent will only consider the comment where it's mentioned
+      - The workflow will:
+        1. Attempt to resolve the issue based on the specific comment
+        2. Create a draft PR if successful, or push a branch if unsuccessful
+        3. Comment on the issue with the results
 
-You can trigger OpenHands in two shared ways (works for both GitHub and GitLab):
+Need help? Feel free to [open an issue](https://github.com/all-hands-ai/openhands/issues) or email us at [contact@all-hands.dev](mailto:contact@all-hands.dev).
 
-Using the 'fix-me' label:
+## Manual Installation
 
-- Add the 'fix-me' label to any issue you want the AI to resolve
-- The agent will consider all comments in the issue thread when resolving
+If you prefer to run the resolver programmatically instead of using GitHub Actions, follow these steps:
 
-Using `@openhands-agent` in an issue/pr comment:
-
-- Create a new comment containing `@openhands-agent`
-- The agent will only consider the comment + comment thread where it's mentioned
-
-## 4. Running Locally
-
-### Installation
+1. Install the package:
 
 ```bash
 pip install openhands-ai
 ```
 
-### Setup
+2. Create a GitHub or GitLab access token:
+   - Create a GitHub acces token
+      - Visit [GitHub's token settings](https://github.com/settings/personal-access-tokens/new)
+      - Create a fine-grained token with these scopes:
+      - "Content"
+      - "Pull requests"
+      - "Issues"
+      - "Workflows"
+      - If you don't have push access to the target repo, you can fork it first
 
-Create a GitHub or GitLab access token with appropriate permissions
+   - Create a GitLab acces token
+      - Visit [GitLab's token settings](https://gitlab.com/-/user_settings/personal_access_tokens)
+      - Create a fine-grained token with these scopes:
+      - 'api'
+      - 'read_api'
+      - 'read_user'
+      - 'read_repository'
+      - 'write_repository'
 
-Set up environment variables:
+3. Set up environment variables:
 
 ```bash
-# GitHub credentials
-export GITHUB_TOKEN="your-github-token"
-export GIT_USERNAME="your-github-username"
 
-# GitLab credentials (if using GitLab)
+# GitHub credentials
+
+export GITHUB_TOKEN="your-github-token"
+export GIT_USERNAME="your-github-username"  # Optional, defaults to token owner
+
+# GitLab credentials if you're using GitLab repo
+
 export GITLAB_TOKEN="your-gitlab-token"
-export GIT_USERNAME="your-gitlab-username"
+export GIT_USERNAME="your-gitlab-username"  # Optional, defaults to token owner
 
 # LLM configuration
-export LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"
+
+export LLM_MODEL="anthropic/claude-3-5-sonnet-20241022"  # Recommended
 export LLM_API_KEY="your-llm-api-key"
-export LLM_BASE_URL="your-api-url"  # Optional
+export LLM_BASE_URL="your-api-url"  # Optional, for API proxies
 ```
 
-### Resolving Issues
+Note: OpenHands works best with powerful models like Anthropic's Claude or OpenAI's GPT-4. While other models are supported, they may not perform as well for complex issue resolution.
 
-Resolve a single issue:
+## Resolving Issues
+
+The resolver can automatically attempt to fix a single issue in your repository using the following command:
 
 ```bash
 python -m openhands.resolver.resolve_issue --selected-repo [OWNER]/[REPO] --issue-number [NUMBER]
 ```
 
-### Responding to PR Comments
+For instance, if you want to resolve issue #100 in this repo, you would run:
 
-Respond to comments on pull requests:
+```bash
+python -m openhands.resolver.resolve_issue --selected-repo all-hands-ai/openhands --issue-number 100
+```
+
+The output will be written to the `output/` directory.
+
+If you've installed the package from source using poetry, you can use:
+
+```bash
+poetry run python openhands/resolver/resolve_issue.py --selected-repo all-hands-ai/openhands --issue-number 100
+```
+
+## Responding to PR Comments
+
+The resolver can also respond to comments on pull requests using:
 
 ```bash
 python -m openhands.resolver.send_pull_request --issue-number PR_NUMBER --issue-type pr
 ```
 
-### Visualizing Results
+This functionality is available both through the GitHub Actions workflow and when running the resolver locally.
 
-View successful PRs:
+## Visualizing successful PRs
+
+To find successful PRs, you can run the following command:
 
 ```bash
 grep '"success":true' output/output.jsonl | sed 's/.*\("number":[0-9]*\).*/\1/g'
 ```
 
-Visualize specific PR:
+Then you can go through and visualize the ones you'd like.
 
 ```bash
 python -m openhands.resolver.visualize_resolver_output --issue-number ISSUE_NUMBER --vis-method json
 ```
 
-### Uploading PRs
+## Uploading PRs
 
-Upload your changes in one of three ways:
+If you find any PRs that were successful, you can upload them.
+There are three ways you can upload:
+
+1. `branch` - upload a branch without creating a PR
+2. `draft` - create a draft PR
+3. `ready` - create a non-draft PR that's ready for review
 
 ```bash
-python -m openhands.resolver.send_pull_request --issue-number ISSUE_NUMBER --username YOUR_GITHUB_OR_GITLAB_USERNAME --pr-type [branch|draft|ready]
+python -m openhands.resolver.send_pull_request --issue-number ISSUE_NUMBER --username YOUR_GITHUB_OR_GITLAB_USERNAME --pr-type draft
 ```
 
-## Custom Instructions
+If you want to upload to a fork, you can do so by specifying the `fork-owner`:
 
-Add repository-specific instructions by creating a file at `.openhands/microagents/repo.md` in your repository. For more information about repository microagents, see [Repository Instructions](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents#2-repository-instructions-private).
+```bash
+python -m openhands.resolver.send_pull_request --issue-number ISSUE_NUMBER --username YOUR_GITHUB_OR_GITLAB_USERNAME --pr-type draft --fork-owner YOUR_GITHUB_OR_GITLAB_USERNAME
+```
+
+## Providing Custom Instructions
+
+You can customize how the AI agent approaches issue resolution by adding a repository microagent file at `.openhands/microagents/repo.md` in your repository. This file's contents will be automatically loaded in the prompt when working with your repository. For more information about repository microagents, see [Repository Instructions](https://github.com/All-Hands-AI/OpenHands/tree/main/microagents#2-repository-instructions-private).
 
 ## Troubleshooting
 
-If you have any issues, please open an issue on this github repo, we're happy to help!
+If you have any issues, please open an issue on this github or gitlab repo, we're happy to help!
 Alternatively, you can [email us](mailto:contact@all-hands.dev) or join the OpenHands Slack workspace (see [the README](/README.md) for an invite link).

openhands/server/session/session.py

@@ -237,6 +237,10 @@ class Session:
             await self.send(event_dict)
 
     async def dispatch(self, data: dict):
+        # Update last_active_ts when receiving data from client
+        # This ensures the session is considered active when the client sends data
+        self.last_active_ts = int(time.time())
+        
         event = event_from_dict(data.copy())
         # This checks if the model supports images
         if isinstance(event, MessageAction) and event.image_urls: