Drop redundant custom commits absorbed by upstream

- Remove microagents/ directory fallback from load_org_skills (use
  skills/ only)
- Update merge guide: document all custom areas, mark 4 commits as
  dropped (VSCode base-path, microagents compat, Azure prompt_cache,
  CI workflow reverts — all now in upstream)
- Update upstream sync marker

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: zparnold

.last-upstream-sync

@@ -1 +1 @@
-2d3d96d329f8eb90708f13b55dbc23ba1c3333d1
+bf4e2ddfa50a874d165e0af4b5f3e6f9b39ebede

docs/upstream-merge-guide.md

@@ -15,24 +15,34 @@ Unlike the OpenHands repo (which has a separate `self-hosted` branch), we work d
 
 ## Custom Commits to Preserve
 
-These commits contain our self-hosted customizations and must survive every merge:
+These customizations must survive every merge. Grouped by area:
 
-1. **`198e2a9`** — `feat(docker): add entrypoint script to handle CA certs and argv stripping`
-2. **`88859a8`** — `feat: configure VSCode server-base-path for proxy support`
-3. **`d1b8c6f`** — `fix: serialize webhook events with mode='json' to include kind field`
-4. **`a2b4f23`** — `Optimize count_events to avoid full iteration when no filters applied`
-5. **`a2140ea`** — `feat: add org-level shared skill registry support`
-6. **`e1fd801`** — `Add auth_header and branch support to agent-server org skills loading`
-7. **`96dd776`** — `Support microagents/ directory in load_org_skills for backwards compat`
-
-Key files touched by custom commits (high conflict risk):
+### Docker/Entrypoint (CA certs for corporate TLS)
 - `openhands-agent-server/openhands/agent_server/docker/entrypoint.sh`
-- `openhands-agent-server/openhands/agent_server/docker/Dockerfile`
-- `openhands-agent-server/openhands/agent_server/vscode_service.py`
-- `openhands-agent-server/openhands/agent_server/event_service.py`
-- `openhands-agent-server/openhands/agent_server/conversation_service.py`
-- `openhands-agent-server/openhands/agent_server/skills_service.py`
-- `openhands-agent-server/openhands/agent_server/skills_router.py`
+- `openhands-agent-server/openhands/agent_server/docker/build.py` (generates entrypoint for all targets)
+- `openhands-agent-server/openhands/agent_server/docker/Dockerfile` (root USER for CA cert merging)
+
+### Webhook & Cost Tracking
+- `openhands-agent-server/openhands/agent_server/event_service.py` — `model_dump(mode="json")` for kind field (upstream bug), stats emission on startup, asyncio thread-safety fix, WebSocket _closed flag
+- `openhands-agent-server/openhands/agent_server/sockets.py` — WebSocket ping/pong heartbeat handler
+
+### Org-Level Skill Registry
+- `openhands-agent-server/openhands/agent_server/skills_service.py` — org skills loading with auth_header + branch
+- `openhands-agent-server/openhands/agent_server/skills_router.py` — org skills routes
+- `openhands-sdk/openhands/sdk/context/agent_context.py` — org skills config fields
+- `openhands-sdk/openhands/sdk/context/skills/skill.py` — `load_org_skills()` function
+
+### Performance
+- `openhands-agent-server/openhands/agent_server/event_service.py` — count_events O(1) fast path
+
+### Error Handling
+- `openhands-sdk/openhands/sdk/workspace/remote/remote_workspace_mixin.py` — file download 4xx detail extraction
+
+### Dropped (2026-03-25)
+- ~~VSCode server-base-path~~ — absorbed by upstream
+- ~~microagents/ directory compat~~ — removed, use skills/ only
+- ~~Azure prompt_cache_retention fix~~ — absorbed by upstream
+- ~~CI workflow reverts~~ — no longer needed
 
 ## Pre-Merge: Check Status
 

openhands-sdk/openhands/sdk/context/skills/skill.py

@@ -1096,47 +1096,31 @@ def load_org_skills(
             logger.warning("Failed to access org skills repository")
             return all_skills
 
-        # Load skills from skills/ (preferred) and microagents/ (legacy)
-        for dir_name in ("skills", "microagents"):
-            search_dir = repo_path / dir_name
-            if not search_dir.exists():
-                continue
+        search_dir = repo_path / "skills"
+        if not search_dir.exists():
+            logger.warning("No skills/ directory found in org repository")
+            return all_skills
 
-            skill_md_files = find_skill_md_directories(search_dir)
-            skill_md_dirs = {skill_md.parent for skill_md in skill_md_files}
-            regular_md_files = find_regular_md_files(search_dir, skill_md_dirs)
+        skill_md_files = find_skill_md_directories(search_dir)
+        skill_md_dirs = {skill_md.parent for skill_md in skill_md_files}
+        regular_md_files = find_regular_md_files(search_dir, skill_md_dirs)
 
-            all_skill_files = list(skill_md_files) + list(regular_md_files)
-            logger.info(f"Found {len(all_skill_files)} skill files in org {dir_name}/")
-
-            existing_names = {s.name for s in all_skills}
-            for skill_file in all_skill_files:
-                try:
-                    skill = Skill.load(
-                        path=skill_file,
-                        skill_base_dir=repo_path,
-                    )
-                    if skill is None:
-                        continue
-                    if skill.name in existing_names:
-                        logger.debug(
-                            f"Skipping duplicate org skill '{skill.name}' "
-                            f"from {dir_name}/"
-                        )
-                        continue
-                    all_skills.append(skill)
-                    existing_names.add(skill.name)
-                    logger.debug(f"Loaded org skill: {skill.name}")
-                except Exception as e:
-                    logger.warning(
-                        f"Failed to load skill from {skill_file.name}: {str(e)}"
-                    )
-                    continue
+        all_skill_files = list(skill_md_files) + list(regular_md_files)
+        logger.info(f"Found {len(all_skill_files)} skill files in org skills/")
 
-        if not all_skills:
-            logger.warning(
-                "No skills/ or microagents/ directory found in org repository"
-            )
+        for skill_file in all_skill_files:
+            try:
+                skill = Skill.load(
+                    path=skill_file,
+                    skill_base_dir=repo_path,
+                )
+                if skill is None:
+                    continue
+                all_skills.append(skill)
+                logger.debug(f"Loaded org skill: {skill.name}")
+            except Exception as e:
+                logger.warning(f"Failed to load skill from {skill_file.name}: {str(e)}")
+                continue
 
     except Exception as e:
         logger.warning(f"Failed to load org skills from {repo_url}: {str(e)}")