AgentSCM - Catch agent merge conflicts at edit time, not merge time.

A team of developers soft-launched AgentSCM, an alpha tool that detects conflicts between AI coding sub-agents and human contributors at edit time rather than at merge or PR time. Installed via `npx agentscm`, it hooks into Claude Code, Codex and Copilot to warn agents when another contributor is working on the same file, with Cursor receiving a post-edit note and any MCP-capable editor able to connect to a hub showing file ownership. The tool uses no file locking and proceeds with edits if the hub is unavailable, and is released under the FSL-1.1-ALv2 license.

Today we're soft-launching the alpha version of AgentSCM https://agentscm.dev for preview and testing. Sub-agents and other team mates contributing to the same source git repo can cause issues not seen until merge or PR time. There are still questions on whether the usual git workflow survives automated agentic coding long-term, but in the interim we are building AgentSCM to build a community of builders looking to work together, as native as possible embedded in their daily workspace s , to catch conflicts between sub-agents and other contributors' agents in real-time. If you don't want to install but are curious to see it in action: https://agentscm.dev/demo/ https://agentscm.dev/demo/ To set it up for real: npx agentscm guided, asks before each change; agentscm uninstall removes it . FAQ Isn't this just worktrees? Worktrees isolate agents. They don't tell them about each other, so you still find out at merge. Won't the agent just retry? Yes, on purpose. A wrong refusal costs one retry, not a stuck agent. The point is the agent learns who's on the file and why, at the moment of the edit. What agents work now? Claude Code, Codex and Copilot, through hooks. Cursor gets a note right after an edit instead of a block. Any MCP-capable editor can connect to the hub to see who holds which files and announce its own work. Is it a file lock? No. Nothing is locked, and if the hub is down or slow the edit proceeds. Telemetry? None in the alpha yet. We plan anonymous usage stats soon with an opt-out during both the self-install process and in the settings / cli flag. License? FSL-1.1-ALv2