fix: resolve merge conflicts and fix type errors in axons.py

After merging origin/main, fixed type handling and test assertions:

1. Fixed type handling in subscribe_sse():
   - Properly handle after_sequence parameter of type int | Omit
   - When last_sequence is provided (reconnection), use it as int
   - When user provides after_sequence, use it
   - When neither (default), use omit which gets filtered by transform

2. Fixed test assertions in test_axon_sse_reconnect.py:
   - Changed from `options["params"]["after_sequence"] is None`
   - To `"after_sequence" not in options["params"]`
   - Reason: transform() filters out Omit values, they don't become None

3. Created AGENTS.md:
   - Documents workflow for making code changes
   - Emphasizes running lint before and after changes
   - Includes common patterns and merge conflict resolution

The merge combined two features:
- Auto-reconnection (from feature branch)
- User-provided after_sequence parameter (from main v1.15.0)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: tode-rl

AGENTS.md

@@ -0,0 +1,144 @@
+# Agent Workflow Guidelines
+
+## Making Code Changes
+
+When making changes to the codebase, follow this workflow to ensure code quality:
+
+### 1. Run Lint Before Changes
+
+Before making any code changes, run the linter to establish a baseline:
+
+```bash
+./scripts/lint
+```
+
+This runs:
+- `pyright` - Type checking
+- `mypy` - Additional type checking
+- `ruff check` - Code linting
+- `ruff format --check` - Format checking
+- Import validation
+
+### 2. Make Your Changes
+
+Make the necessary code changes, ensuring you:
+- Follow existing code patterns
+- Update type annotations
+- Handle edge cases (e.g., `Omit`, `NotGiven`, `None`)
+- Maintain backward compatibility
+
+### 3. Update Tests
+
+Update or add tests for your changes:
+- Unit tests in `tests/`
+- Smoke tests in `tests/smoketests/`
+- Ensure tests match the new behavior
+
+### 4. Run Lint After Changes
+
+After making changes, run the linter again to catch any issues:
+
+```bash
+./scripts/lint
+```
+
+Fix any new errors or warnings that appear.
+
+### 5. Run Tests
+
+Run the test suite to ensure everything works:
+
+```bash
+# Run all tests
+uv run pytest
+
+# Run specific tests
+uv run pytest tests/test_axon_sse_reconnect.py -xvs
+
+# Run smoke tests
+uv run pytest tests/smoketests/ -m smoketest
+```
+
+### 6. Commit Changes
+
+Once lint and tests pass, commit your changes:
+
+```bash
+git add -A
+git commit -m "type: description
+
+Detailed explanation of changes
+
+Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>"
+```
+
+## Common Patterns
+
+### Handling Optional Parameters
+
+When dealing with parameters that can be omitted:
+
+```python
+# Parameter definition
+def method(self, param: int | Omit = omit):
+    ...
+
+# In implementation, check for Omit before using
+if not isinstance(param, Omit):
+    use_param(param)
+else:
+    # param was omitted, use default behavior
+    pass
+```
+
+### Type-Safe Transformations
+
+The `transform` function automatically filters out `Omit` and `NotGiven` values:
+
+```python
+# This dict with omitted values
+{"field": omit, "other": 123}
+
+# Becomes this after transform
+{"other": 123}
+```
+
+### Testing with Mocks
+
+When testing methods that call `_get` or similar:
+
+```python
+with patch.object(client.resource, "_get") as mock_get:
+    mock_stream = Mock(spec=Stream)
+    mock_get.return_value = mock_stream
+
+    # Your test code
+    result = client.resource.method()
+
+    # Verify the call
+    call_args = mock_get.call_args
+    options = call_args.kwargs["options"]
+    assert options["params"]["field"] == expected_value
+```
+
+## Merge Conflict Resolution
+
+When merging branches:
+
+1. **Understand both changes** - Read the diff from both sides
+2. **Combine features intelligently** - Don't just pick one side
+3. **Update tests** - Tests may need adjustments for merged behavior
+4. **Fix type errors** - Merges can introduce type mismatches
+5. **Validate syntax** - Run `python3 -m py_compile` on changed files
+6. **Run full lint** - Ensure everything passes
+
+## Example: Recent Merge Fix
+
+The merge of `origin/main` into `feature/ts-pr-765-port` required:
+
+1. **Code fix** - Handle `Omit` type properly in reconnection logic
+2. **Test fix** - Update assertions from `is None` to `not in dict`
+3. **Syntax check** - Verify Python syntax is valid
+4. **Type check** - Ensure mypy/pyright pass
+
+See commit history for the resolution pattern.

src/runloop_api_client/resources/axons/axons.py

@@ -311,7 +311,12 @@ def subscribe_sse(
 
         def create_stream(last_sequence: str | None) -> Stream[AxonEventView]:
             # Use user-provided after_sequence for initial stream, then use last_sequence for reconnections
-            sequence_to_use = after_sequence if last_sequence is None else int(last_sequence)
+            if last_sequence is not None:
+                sequence_to_use = int(last_sequence)
+            elif not isinstance(after_sequence, Omit):
+                sequence_to_use = after_sequence
+            else:
+                sequence_to_use = omit
             return self._get(
                 path_template("/v1/axons/{id}/subscribe/sse", id=id),
                 options=make_request_options(
@@ -621,7 +626,12 @@ async def subscribe_sse(
 
         async def create_stream(last_sequence: str | None) -> AsyncStream[AxonEventView]:
             # Use user-provided after_sequence for initial stream, then use last_sequence for reconnections
-            sequence_to_use = after_sequence if last_sequence is None else int(last_sequence)
+            if last_sequence is not None:
+                sequence_to_use = int(last_sequence)
+            elif not isinstance(after_sequence, Omit):
+                sequence_to_use = after_sequence
+            else:
+                sequence_to_use = omit
             return await self._get(
                 path_template("/v1/axons/{id}/subscribe/sse", id=id),
                 options=make_request_options(

tests/test_axon_sse_reconnect.py

@@ -161,7 +161,7 @@ def empty_iter(_self: object) -> Iterator[object]:
             assert options["headers"]["Accept"] == "text/event-stream"
             assert options["headers"]["X-Custom"] == "value"
             assert options["params"]["param"] == "value"
-            assert options["params"]["after_sequence"] is None
+            assert "after_sequence" not in options["params"]
             assert options["timeout"] == 30.0
 
 
@@ -322,7 +322,7 @@ async def mock_iter():
             assert options["headers"]["Accept"] == "text/event-stream"
             assert options["headers"]["X-Custom"] == "value"
             assert options["params"]["param"] == "value"
-            assert options["params"]["after_sequence"] is None
+            assert "after_sequence" not in options["params"]
             assert options["timeout"] == 30.0