hivecode-mcp 0.11.6 → 0.12.0

package/core.js

@@ -2,20 +2,20 @@
 // in test.js. Keeping these here (instead of copy-pasted) means a fix in one
 // place fixes everywhere, and the tests exercise the REAL code.
 
-// Minimal text diff: replace only the changed middle, preserving the common
-// prefix/suffix. Applied to a Y.Text so edits stay small (good for CRDT churn).
-export function applyDiff(ytext, next) {
-  const cur = ytext.toString()
-  if (cur === next) return false
-  let p = 0
-  while (p < cur.length && p < next.length && cur[p] === next[p]) p++
-  let s = 0
-  while (s < cur.length - p && s < next.length - p && cur[cur.length - 1 - s] === next[next.length - 1 - s]) s++
-  if (cur.length - p - s > 0) ytext.delete(p, cur.length - p - s)
-  const ins = next.slice(p, next.length - s)
-  if (ins) ytext.insert(p, ins)
-  return true
-}
+import reconcilePkg from './reconcile.cjs'
+
+export const {
+  applyDiff,
+  hasConflictMarkers,
+  stripConflictMarkers,
+  merge3,
+  summarizeChange,
+  changedRange,
+  symbolsIn,
+  icrMerge3,
+  createReconciler,
+  reconcile
+} = reconcilePkg
 
 // Optimistic concurrency: is a write based on `expected` still safe to apply?
 // Returns the new version on success, or { stale, current } if the region moved.
@@ -89,135 +89,3 @@ export function mergeEdit(base, mine, current) {
   return { conflict: true } // same lines changed two ways -> re-reason on `current`
 }
 
-// Detect REAL git-style conflict markers in a file. Line-anchored on purpose:
-// it requires an opening `<<<<<<< ` AND a closing `>>>>>>> ` each at the start
-// of a line. This is what merge3 emits. A naive `text.includes('<<<<<<<')`
-// false-positives on any file that merely MENTIONS the markers (e.g. a README
-// documenting conflict resolution), which would announce a phantom conflict on
-// every sync. (Found by a live two-agent test, 2026-06-19.)
-export function hasConflictMarkers(text) {
-  return /^<<<<<<< /m.test(text || '') && /^>>>>>>> /m.test(text || '')
-}
-
-// Strip and de-nest conflict markers to prevent exponential 2^N code ballooning
-export function stripConflictMarkers(text, prefer = 'local') {
-  if (!text || !hasConflictMarkers(text)) return text || ''
-  const lines = text.split('\n')
-  const out = []
-  let inConflict = false
-  let inTheirs = false
-  const localBlock = []
-  const theirsBlock = []
-
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i]
-    if (/^<<<<<<< /.test(line)) {
-      inConflict = true
-      inTheirs = false
-      localBlock.length = 0
-      theirsBlock.length = 0
-      continue
-    }
-    if (/^=======$/.test(line) && inConflict) {
-      inTheirs = true
-      continue
-    }
-    if (/^>>>>>>> /.test(line) && inConflict) {
-      inConflict = false
-      out.push(...(prefer === 'theirs' ? theirsBlock : localBlock))
-      continue
-    }
-    if (inConflict) {
-      if (inTheirs) theirsBlock.push(line)
-      else localBlock.push(line)
-    } else {
-      out.push(line)
-    }
-  }
-  return out.join('\n')
-}
-
-// --- 3-way merge for the SYNC layer (disk <-> shared doc) ---
-// Same idea as mergeEdit, but instead of bailing with { conflict } it always
-// returns text: disjoint edits merge cleanly; overlapping edits are wrapped in
-// git-style conflict markers so BOTH versions survive and a human/AI resolves.
-// De-nests existing conflict blocks to prevent exponential duplication.
-//   merge3(base, mine, theirs) -> { text, conflict }
-export function merge3(base, mine, theirs) {
-  if (mine === theirs) return { text: mine, conflict: false }
-  if (base === theirs) return { text: mine, conflict: false }  // only I changed
-  if (base === mine) return { text: theirs, conflict: false }  // only they changed
-
-  // De-nest stale conflict markers so conflict blocks never wrap exponentially
-  const cleanBase = hasConflictMarkers(base) ? stripConflictMarkers(base, 'local') : (base || '')
-  const cleanMine = hasConflictMarkers(mine) ? stripConflictMarkers(mine, 'local') : (mine || '')
-  const cleanTheirs = hasConflictMarkers(theirs) ? stripConflictMarkers(theirs, 'theirs') : (theirs || '')
-
-  if (cleanMine === cleanTheirs) return { text: cleanMine, conflict: false }
-  if (cleanBase === cleanTheirs) return { text: cleanMine, conflict: false }
-  if (cleanBase === cleanMine) return { text: cleanTheirs, conflict: false }
-
-  const b = cleanBase.split('\n')
-  const mr = changedRange(b, cleanMine.split('\n'))
-  const tr = changedRange(b, cleanTheirs.split('\n'))
-  if (mr.endBase <= tr.startBase || tr.endBase <= mr.startBase) {
-    const out = b.slice()
-    for (const e of [mr, tr].sort((x, y) => y.startBase - x.startBase)) {
-      out.splice(e.startBase, e.endBase - e.startBase, ...e.newLines)
-    }
-    return { text: out.join('\n'), conflict: false }
-  }
-  // Overlap: reconstruct each side's lines over the union region [start,end).
-  const start = Math.min(mr.startBase, tr.startBase)
-  const end = Math.max(mr.endBase, tr.endBase)
-  const mineBlock = [...b.slice(start, mr.startBase), ...mr.newLines, ...b.slice(mr.endBase, end)]
-  const theirsBlock = [...b.slice(start, tr.startBase), ...tr.newLines, ...b.slice(tr.endBase, end)]
-  const out = [
-    ...b.slice(0, start),
-    '<<<<<<< local (yours)',
-    ...mineBlock,
-    '=======',
-    ...theirsBlock,
-    '>>>>>>> incoming (theirs)',
-    ...b.slice(end),
-  ]
-  return { text: out.join('\n'), conflict: true }
-}
-
-// --- Rewrite detection for the auto-board ---
-// Classify a change as a small PATCH (grep-and-edit, the common case) vs a
-// wholesale REWRITE, and pull out the symbol names the new version defines in
-// the changed region. The sync layer uses this to AUTO-record what an agent did
-// on a rewrite — so other agents learn of it even when the agent forgets to say.
-//   summarizeChange(base, next) -> { isRewrite, changedLines, totalLines, symbols }
-export function summarizeChange(base, next) {
-  const b = (base || '').split('\n')
-  const n = (next || '').split('\n')
-  if (!base) return { isRewrite: false, changedLines: n.length, totalLines: n.length, symbols: symbolsIn(next || '') }
-  const r = changedRange(b, n)
-  const churn = Math.max(r.endBase - r.startBase, r.newLines.length) // lines replaced or added
-  const total = Math.max(b.length, n.length)
-  // a rewrite = at least half the file churned (and more than a couple of lines)
-  const isRewrite = total > 0 && churn >= 4 && churn / total >= 0.5
-  return { isRewrite, changedLines: churn, totalLines: total, symbols: symbolsIn(r.newLines.join('\n')) }
-}
-
-// Best-effort "what was defined here" across common languages — for the board.
-function symbolsIn(text) {
-  const names = new Set()
-  const add = (re) => { let m; while ((m = re.exec(text)) && names.size < 8) names.add(m[1]) }
-  add(/\bfunction\s+(\w+)/g)        // function foo
-  add(/\bclass\s+(\w+)/g)           // class Foo
-  add(/\bdef\s+(\w+)/g)             // def foo (python)
-  add(/\b(?:export\s+)?(?:const|let|var)\s+(\w+)\s*=/g) // const foo =
-  return [...names].slice(0, 8)
-}
-
-// Which base line-range an edit replaced, and the replacement lines.
-export function changedRange(base, other) {
-  let p = 0
-  while (p < base.length && p < other.length && base[p] === other[p]) p++
-  let s = 0
-  while (s < base.length - p && s < other.length - p && base[base.length - 1 - s] === other[other.length - 1 - s]) s++
-  return { startBase: p, endBase: base.length - s, newLines: other.slice(p, other.length - s) }
-}

package/docs/MCP.md

@@ -15,7 +15,7 @@ Add Hivecode to your MCP client config. The command runs this repo's server.
     "hivecode": {
       "command": "node",
       "args": ["C:/Users/G1/Desktop/N/hive-mcp.js"],
-      "env": { "HIVE_RELAY": "wss://livecode-xoss.onrender.com" }
+      "env": { "HIVE_RELAY": "wss://hivecode-relay.onrender.com" }
     }
   }
 }

package/docs/SELF_HOSTING.md

@@ -0,0 +1,253 @@
+# Run your own relay
+
+Hivecode is **three pieces, and only one of them needs hosting: the relay.** Run that one
+server and your team's source never reaches a machine you do not own.
+
+This is the supported path for any team that cannot send its code to a third party. It is
+also the only path that does not depend on somebody else's uptime.
+
+For the click-by-click cloud deploy see [DEPLOY.md](DEPLOY.md). For how it all works under
+the hood see [ARCHITECTURE.md](ARCHITECTURE.md). For tokens and scopes see [RBAC.md](RBAC.md).
+
+---
+
+> **You install one package, not a repository.** `npx hivecode-relay` downloads the relay and
+> nothing else — no agent client, no editor extension, no test suite, no build tooling. It is a
+> separate npm package from `hivecode-mcp`, which is what your developers and agents install.
+
+## What you actually host
+
+Only the relay. It is plain Node with no native dependencies, it holds **no canonical copy
+of your code**, and it never writes your files to disk unless you turn persistence on (which
+you should — see below). It passes CRDT updates between clients in the same room and enforces
+access at the handshake. The editor extension and the agent MCP server run on each
+participant's own machine.
+
+```
+You host ONE relay  ─────►  wss://your-relay.example.com
+                               ▲          ▲          ▲
+                            humans     humans      AI agents
+                          (VS Code)  (VS Code)      (MCP)
+                                  all pointed at your relay
+```
+
+---
+
+## Step 1 — Start the relay
+
+```bash
+npx hivecode-relay
+```
+
+That is the whole command. It starts the relay with **persistence on**, prints the join link,
+and prints the exact settings each teammate needs. Useful flags:
+
+| Flag | Default | What it does |
+|---|---|---|
+| `--port 1234` | `1234` | Port to listen on. |
+| `--data ./hive-data` | `./hive-data` | Where rooms are persisted. |
+| `--room my-project` | random | Print the link for a named room instead of a random one. |
+| `--secret <string>` | none | Turn on **auth-required** mode: only holders of a minted token may connect. |
+| `--seats 25` | `25` | Connection budget. See *How much can one relay handle?* below. |
+
+Three ways to run it, in increasing order of "a real team depends on this":
+
+**A. On a laptop or a box on your LAN.** `npx hivecode-relay`, hand out the `ws://192.168.x.x:1234`
+address it prints. Good for a trial, a workshop, or a co-located team. It is **not encrypted**
+— fine inside a network you trust, not fine across the internet.
+
+**B. On your own server, behind TLS.** Run it behind a reverse proxy that terminates TLS and
+upgrades WebSockets, and hand out the `wss://` address. This is the normal production shape.
+
+**C. On a container host.** The included [`Dockerfile`](../Dockerfile) works on Fly.io, Railway,
+Render, Cloud Run or anything else that runs containers. [`render.yaml`](../render.yaml) makes
+Render one-click; the walkthrough is in [DEPLOY.md](DEPLOY.md).
+
+You deploy once. After that it stays up.
+
+### A remote team, keeping it private
+
+A relay on a laptop is reachable only from that network. For teammates in other places there
+are three real options, and they are **not** equally private:
+
+| Option | Private? | Stays up? | Setup |
+|---|---|---|---|
+| **Private network (Tailscale or similar)** — relay on any team machine, teammates join the same private network and use its `100.x.y.z` or `*.ts.net` address | **Yes.** WireGuard end to end; nothing outside the network can even reach the relay | Only while that machine is on | Each person installs the app and logs in once |
+| **Your own server** — a small cloud VM or office box in *your* account, TLS terminated on it | **Yes.** You run every machine the traffic touches | Yes | One-time server setup |
+| **Public tunnel** (`cloudflared tunnel --url http://localhost:1234`, ngrok) | **No.** The tunnel provider decrypts traffic at its edge, and the URL is public | Only while the laptop is on; quick tunnels get a new URL every restart | One command |
+
+A public tunnel works — verified end to end: two clients synced a file through a Cloudflare
+quick tunnel, and a client holding the URL but no token was refused. Use it for a trial, and
+**always with `--secret`**, because a public URL on an open relay is an open room. `hive_status`
+says so on every join: `YOUR RELAY — through a public tunnel`.
+
+---
+
+## Step 2 — Point EVERY client at it
+
+This is the step teams get half-right, so it is worth being blunt about what "half-right"
+costs. There are two kinds of client and they read two different settings:
+
+| Client | Setting | Where |
+|---|---|---|
+| **Human** (VS Code) | `hivecode.relayUrl` | VS Code settings |
+| **AI agent** (MCP) | `HIVE_RELAY` | the `env` block of the agent's MCP server config |
+
+**If you set one and forget the other, nothing fails.** The agent falls back to the public
+relay this build ships as a default, joins a room with the same name, reports `connected`,
+and publishes your files there. Your humans are on your relay, your agent is on ours, and
+every status line on both sides is green.
+
+So set the pin as well:
+
+```
+HIVE_RELAY_PIN = wss://your-relay.example.com
+```
+
+`HIVE_RELAY` is a *default*. `HIVE_RELAY_PIN` is a *rule*: this machine may only ever talk
+to these relays, and any attempt to connect anywhere else is refused **before the socket
+opens**, with error **Q550**, having published nothing. Set it on every machine — humans'
+and agents' alike — and a stale link, a typo'd host or a forgotten environment variable
+becomes a loud refusal instead of a silent upload.
+
+Two more knobs:
+
+- `HIVE_RELAY_PIN` accepts a comma-separated list, for teams with a staging relay and a
+  production one.
+- `HIVE_PRIVATE=1` refuses the shipped public default (**Q551**) even when no pin is set.
+  Use it as a belt-and-braces setting on a machine that must never reach our relay.
+
+A pin that cannot be parsed is **refused (Q552)**, never ignored. A typo that silently
+degraded to "no pin" would leave you believing a machine was locked down when it was not.
+
+---
+
+## Step 3 — Create a room and invite people
+
+A connection is encoded as a **join link**:
+
+```
+wss://your-relay.example.com|room-myproject
+   └──── your relay ────┘ └──── room id ────┘
+```
+
+1. `npx hivecode-relay --room myproject` prints the link.
+2. Share it with teammates and agents.
+3. **Humans** run **Hivecode: Join a Session** in VS Code and paste it.
+4. **Agents** get it as the `link` argument to `hive_join`.
+5. Same link = same room = one live codebase for everyone.
+
+---
+
+## Step 4 — Add AI agents
+
+Agents join through the MCP server. Register it once in the agent's host (Claude Code,
+Cursor, Windsurf, or your own bot):
+
+```json
+{
+  "mcpServers": {
+    "hivecode": {
+      "command": "npx",
+      "args": ["-y", "hivecode-mcp"],
+      "env": {
+        "HIVE_RELAY": "wss://your-relay.example.com",
+        "HIVE_RELAY_PIN": "wss://your-relay.example.com"
+      }
+    }
+  }
+}
+```
+
+Then hand it the join link. It appears in the room as an `ai` member, scoped to exactly the
+folders you invited it to. See [JOIN_WITH_AGENT.md](JOIN_WITH_AGENT.md) and [MCP.md](MCP.md).
+
+---
+
+## Step 5 — Check that it is actually private
+
+Do not take a green join as evidence. Two checks, thirty seconds:
+
+**1. Ask each client where it is.** `hive_status` reports a `privacy` field next to
+`connected`:
+
+```
+privacy: "PRIVATE — relay on your network"     ← yours
+privacy: "PUBLIC RELAY — not yours"            ← ours. Your files are on our server.
+```
+
+A human client shows the same thing in the join banner: `relay: <url>  [VERDICT]`.
+
+**2. Ask your relay who is on it.** `curl http://your-relay:1234/health` reports
+`connections` and `rooms`. The number of connections should account for everybody. If a
+teammate says they are in the room and your relay's count did not move, they are in
+*a* room — just not on your relay.
+
+You can prove the whole path on your own machine in about a minute:
+
+```bash
+node tests/self-host-test.mjs
+```
+
+That suite starts a real relay, syncs a real file between two real clients through it,
+asserts the relay's own counters moved, and asserts that a pinned client refuses the public
+relay. It is the evidence behind every claim on this page.
+
+---
+
+## Step 6 — Lock it down before you invite anyone real
+
+| Env var | Why you want it |
+|---|---|
+| `HIVE_AUTH_MODE=required` + `HIVE_JWT_SECRET=<secret>` | Every connection must present a valid token. This is your invite-only control. `npx hivecode-relay --secret <secret>` sets both. Mint tokens with `npx hivecode-token --room <room> --name <who> --role writer --ttl 7d` on the relay host, which is the only machine that holds the secret. See [RBAC.md](RBAC.md). |
+| `HIVE_PERSIST_DIR=/var/data/hive` | **Important.** Without it a room lives only in connected clients' memory and is **lost the moment everyone disconnects** — the day works perfectly and the folder is empty in the morning. `npx hivecode-relay` turns this on by default; `node server.js` does not. |
+| `HIVE_SEATS=<n>` | Connection budget for the whole relay. The default free-tier ceiling is 8 per room, which is **not** 8 people — see below. |
+| `HIVE_AUDIT_FILE=./audit.log` | One line per admit and reject. This is your evidence of who connected and when. |
+| `RENDER_EXTERNAL_URL` (auto on Render) | Keeps a free-tier host warm so the first join is not a 30-second cold start. |
+
+> ⚠️ **An open relay on a public IP is a public relay.** Without `HIVE_AUTH_MODE=required`,
+> anyone who can reach the port and guesses a room id can read and write your files. On a
+> laptop or a private LAN that is a reasonable trade. On a public IP it is not.
+
+---
+
+## How much can one relay handle?
+
+**Count connections, not people.** Each participant holds one base-room socket **plus one
+per open file**, so a five-person team is not five connections — it is up to
+`participants × (1 + HIVE_MAX_OPEN_FILES)`. The client caps its own working set at
+`HIVE_MAX_OPEN_FILES` (default 128) for exactly this reason.
+
+Two different ceilings refuse you, with two different remedies:
+
+| You see | Meaning | Fix |
+|---|---|---|
+| **Q430** (503) | the whole relay is at `maxConnsTotal` (512) | `HIVE_MAX_CONNS_TOTAL` — **`HIVE_SEATS` does not help here** |
+| **Q431** (429) | one room is at its per-room cap | `HIVE_SEATS` |
+
+- **A focused team (~10 humans and their agents in one room): comfortably**, on a small
+  always-on instance (≈1 vCPU / 1–2 GB). Free tiers are fine for a trial.
+- **Hundreds of concurrent users across many rooms:** scale the instance up, or — the natural
+  model — let each team run its own relay so the load distributes.
+
+Two operational rules:
+
+1. **Turn on persistence** before real users join.
+2. **Do not redeploy the relay while people are working** — a restart drops everyone. Deploy
+   from a stable tag, off-hours.
+
+---
+
+## What self-hosting does not give you
+
+Said plainly, because discovering it later is worse:
+
+- **Uptime is yours.** Nobody is paged when your box dies at 2am.
+- **`ws://` is plaintext.** Self-hosting is not encryption. Put TLS in front of it.
+- **An open relay is open.** Running it yourself controls *where* the bytes go, not *who*
+  may fetch them. That is what `HIVE_AUTH_MODE=required` is for.
+- **Path scoping needs auth mode.** The `--paths` globs in a token are only enforced when the
+  relay runs in `required` mode. On an open relay every token is ignored, so a "scoped" agent
+  gets the whole room.
+- **Mixed client versions do not sync.** Everyone on the relay must be on the same Hivecode
+  version; announce yours on join.