http api, queue and dedupe, watch-all, sync polish, docs

Dockerfile

@@ -0,0 +1,32 @@
+# Use the official Go image as a base
+FROM golang:latest
+
+# Set the working directory
+WORKDIR /usr/gitnostr
+
+# Copy the source code
+COPY . .
+
+# Install openssh-server
+RUN apt-get update && apt-get install -y openssh-server
+
+# Generate a new SSH key for the root user
+RUN ssh-keygen -t rsa -f /root/.ssh/id_rsa -N ''
+
+# Allow root login via SSH
+RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+# Build the binary
+RUN CGO_ENABLED=0 go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/git-nostr-bridge ./cmd/git-nostr-bridge
+RUN CGO_ENABLED=0 go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/git-nostr-ssh ./cmd/git-nostr-ssh
+RUN CGO_ENABLED=0 go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/gn ./cmd/git-nostr-cli
+
+# Create config
+RUN mkdir -p /root/.config/git-nostr
+
+# Configure git-nostr-bridge
+# Replace gitRepoOwners key with your public key (hex)
+RUN echo '{"repositoryDir": "/root/git-nostr-repositories","DbFile": "/root/.config/git-nostr/git-nostr-db.sqlite","relays": ["wss://relay.gittr.space", "wss://relay.damus.io", "wss://nos.lol", "wss://relay.primal.net"],"gitRepoOwners": ["d7a2565a3d29c05a72c315c9117594bb0c76eda7ebfdda3441d0eb6ba326c5e1"]}' > /root/.config/git-nostr/git-nostr-bridge.json
+
+# Set the default command to run when the container starts
+CMD service ssh start && /usr/gitnostr/bin/git-nostr-bridge -config=/root/.config/git-nostr/git-nostr-bridge.json

Makefile

@@ -9,5 +9,13 @@ git-nostr-bridge:
 git-nostr-cli:
 	go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/gn ./cmd/git-nostr-cli
 
+.PHONY: migrate-npub-symlinks
+migrate-npub-symlinks:
+	go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/migrate-npub-symlinks ./cmd/migrate-npub-symlinks
+
+.PHONY: migrate-commit-dates
+migrate-commit-dates:
+	go build -tags netgo -ldflags="-s -w" -trimpath -o ./bin/migrate-commit-dates ./cmd/migrate-commit-dates
+
 .PHONY: all
-all: git-nostr-bridge git-nostr-cli
+all: git-nostr-bridge git-nostr-cli migrate-npub-symlinks migrate-commit-dates

README.md

@@ -1,188 +1,69 @@
-# Nostr Git
+# gitnostr
 
-A proof of concept integration of git and nostr providing
+**Git bridge to Nostr** for [gittr](https://gittr.space). Same codebase as **[arbadacarbaYK/gitnostr](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?branch=main)** on gittr.
 
-- repository management
-- ssh-key management
-- repository permission management
+**Components:** `git-nostr-bridge` · `git-nostr-ssh` · `git-nostr-db` · `git-nostr-cli` (`gn`)
 
-This will hopefully form part of a solution for creating a decentralized version of the github/gitlab experience.
+## Where this sits (platform map)
 
-I chose to build on top of the existing git tooling to allow the client side dev tools to remain largely unchanged for daily work (standard git commands work including push and pull)
+This repo is the **git server layer** — not the website and not the AI tools. **You are here = gitnostr Bridge** (`git.gittr.space`, teal). Cyan-outlined host boxes = public hostnames (teal = this repo; cyan outline = host URLs).
 
-By storing the config on Nostr your repository configuration can be easily regenerated a new host if your current git provider decides to censor you.
+![Platform map: gitnostr Bridge at git.gittr.space](docs/platform-map.svg)
 
-See a demo video here: https://www.youtube.com/watch?v=G-WzlC8XfW4
+```mermaid
+flowchart LR
+  UI["gittr Client<br/>gittr.space"]
+  MCP["gittr-mcp<br/>AI agents"]
+  CLI["git / gn / SSH"]
+  Bridge["★ YOU ARE HERE · gitnostr Bridge<br/>git.gittr.space<br/>SSH / HTTPS · bare repos"]
+  RelayGittr["gittr Pyramid relay<br/>relay.gittr.space<br/>wss · open forge + GRASP"]
+  Relays["Other Nostr relays"]
+  Pages["Pages / nsite<br/>pages.gittr.space"]
+  Blossom["Blossom<br/>blossom.gittr.space"]
+  Remote["git remote nostr<br/>optional · ngit"]
 
-There is much more to a decentralized github/gitlab experience than just a repository. It would also be advantageous to move pull requests and issues to the Nostr protocol. These should however be treated as separate projects that will hopefully be interopable with this project's approach to repository management.
-
-
-# How
-
-![Architecture diagram](git-nostr.png)
-
-## git-nostr-db
-
-An sqlite DB is used to cache the latest version of the data needed to perform access control checks to avoid development downtime in case of a relay or the git-nostr-bridge being offline.
-
-### git-nostr-bridge
-
-Connects to a set of relays and:
-1. subscribes to the events needed to keep the git-nostr-db up to date
-2. creates git repositories as needed
-3. updates the ssh authorized_keys file
-
-**DO NOT RUN THE BRIDGE AS YOUR OWN USER YOU WILL LOSE YOUR AUTHORIZED_KEYS FILE**
-
-### git-nostr-ssh
-
-Configured as the command for a nostr users ssh-key in the authorized_keys file.
-Whenever a user tries to perform a git operation (push/pull) git-nostr-ssh will perform an access control check.
-
-### git-nostr-hook
-
-TODO: not implemented yet.
-
-Will enable fine grain branch control e.g. prevent pushing to specific branches or force pushing to a branch.
-
-### git-nostr-cli (gn)
-
-Command line tool with similar options to the github cli that will publish the relevant events using your private key to the configured relays
-
-git-nostr-bridge will then react to these events and update the DB and create any git repos needed.
-
-
-# Setup Instructions
-
-**Currently this project is Linux only**
-**Go version 1.20+ is required**
-**It is recommended to use a local private relay for testing. Testing was performed using https://github.com/scsibug/nostr-rs-relay**
-
-## git-nostr-bridge
-
-**These instructions are needed if you intend to host git repositories. If another nostr user has configured a git-nostr-bridge for you then follwo the git-nostr-cli instructions below.**
-
-Create a new user to host the git repositories (This is needed as the bridge will overwrite the authroized_keys file) and switch to the new account
-
-**DO NOT RUN THE BRIDGE AS YOUR OWN USER YOU WILL LOSE YOUR AUTHORIZED_KEYS FILE**
-
-```bash
-sudo useradd --create-home git-nostr
-sudo su - git-nostr
-```
-
-Clone the gitnostr repository and build the bridge components
-
-```bash
-git clone https://github.com/spearson78/gitnostr
-cd gitnostr
-make git-nostr-bridge
-```
-
-Start the bridge once to create the empty config files. **DO NOT RUN THE BRIDGE AS YOUR OWN USER YOU WILL LOSE YOUR AUTHORIZED_KEYS FILE**
-
-```bash
-./bin/git-nostr-bridge
-```
-
-You should get the message `no relays connected`
-
-Edit the config file at `~/.config/git-nostr/git-nostr-bridge.json`. The default file should look like this
+  UI -->|announce · push UI| RelayGittr
+  UI -->|announce · push UI| Relays
+  UI -->|import / sync| Bridge
+  UI -->|Pages blobs| Blossom
+  MCP -->|HTTP + Nostr auth| Bridge
+  MCP --> RelayGittr
+  MCP --> Relays
+  CLI -->|SSH / HTTPS git| Bridge
+  Bridge -->|watch kinds · bare repos| RelayGittr
+  Bridge -->|watch kinds · bare repos| Relays
+  Pages -.->|sites, not git objects| Relays
+  Pages --> Blossom
+  Remote -.->|same NIP-34 events| Relays
 
-```
-{
-    "repositoryDir": "~/git-nostr-repositories",
-    "DbFile": "~/.config/git-nostr/git-nostr-db.sqlite",
-    "relays": [],
-    "gitRepoOwners": []
-}
-```
-
-Add your relay of relays to the list of relays. **You should use a local relay for testing until the implementation is finalized.**
-Add your public key to the list of gitRepoOwners. **It is recommended to generate a new nostr private/public key pair for testing**
-
-git-nostr-bridge will follow events published by gitRepoOwners and create git repositories for them.
-
-My local testing config looks like this
-
-```
-{
-    "repositoryDir": "~/git-nostr-repositories",
-    "DbFile": "~/.config/git-nostr/git-nostr-db.sqlite",
-    "relays": ["ws://localhost:8080"],
-    "gitRepoOwners": ["e0e7807d354ea7662412d99856335e1923b0b57b6668575bf320837f6b1816e3"]
-}
-```
-
-You can now start the bridge again. **DO NOT RUN THE BRIDGE AS YOUR OWN USER YOU WILL LOSE YOUR AUTHORIZED_KEYS FILE**
-
-```bash
-./bin/git-nostr-bridge
-```
-
-As no events have been published you should see no console output.
-
-Your git-nostr-bridge is now ready for use
-
-## git-nostr-cli (gn)
-
-**Watch out for a conflict with the gn command from https://gn.googlesource.com **
-
-Clone the gitnostr repository and build the cli components
-
-```bash
-git clone https://github.com/spearson78/gitnostr
-cd gitnostr
-make git-nostr-cli
-```
-
-run the git-nostr-cli command once to create the default config file
-
-```bash
-./bin/gn
-```
-
-You should get the message `no relays connected`
-
-Edit the config file at `~/.config/git-nostr/git-nostr-cli.json`. The default file should look like this
-
-```
-{
-    "relays": [],
-    "privateKey": "",
-    "gitSshBase": ""
-}
+  classDef youAreHere fill:#0f766e,stroke:#5eead4,stroke-width:3px,color:#ecfdf5
+  classDef hostUrl fill:#164e63,stroke:#22d3ee,stroke-width:2px,color:#ecfeff
+  class Bridge youAreHere
+  class Pages,Blossom,RelayGittr hostUrl
 ```
 
-Add your relay of relays to the list of relays. **You should use a local relay for testing until the implementation is finalized.**
-Set your private key. **It is recommended to generate a new nostr private key for testing**
-Set gitSshBase to the ssh user@hostname where a git-nostr-bridge has been installed.
+| Piece | Host / on gittr | Talks to this bridge how? |
+| --- | --- | --- |
+| **gittr Client** | [gittr](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gittr?branch=main) · `gittr.space` | Push/import → bridge API; clone URLs point at **`git.gittr.space`** |
+| **★ gitnostr (this README)** | [gitnostr](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?branch=main) · **`git.gittr.space`** | **You are here** — bare repos, SSH keys (kind 52), permissions |
+| **gittr-mcp** | [gittr-mcp](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gittr-mcp) | Agents push/list via HTTPS + signed Nostr headers |
+| **Pages / nsite** | [nsite-gateway](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/nsite-gateway) · **`pages.gittr.space`** | Separate — static sites from Nostr, not the git object store |
+| **Blossom** | **`blossom.gittr.space`** | Blob store used by Pages (and related media) — not git objects |
+| **gittr Pyramid relay** | [pyramid](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/pyramid) · **`relay.gittr.space`** | Open `wss://` forge relay the bridge also watches |
+| **gittr-helper-tools** | [gittr-helper-tools](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gittr-helper-tools?branch=main) | Snippets only — not a runtime host (omitted from the diagram) |
+| **git remote nostr** | [ngit-cli](https://github.com/DanConwayDev/ngit-cli) | Optional; reads/writes same relay events; may also hit `clone` HTTPS |
 
-My local testing config looks like this
+**Addressing:** on disk, owner dirs are **hex pubkey**; HTTPS clone tags use **npub** via `npub → hex` symlinks on **`git.gittr.space`** (NIP-34-friendly). SSH accepts hex or npub.
 
-```
-{
-    "relays": ["ws://localhost:8080"],
-    "privateKey": "...",
-    "gitSshBase": "git-str@localhost"
-}
-```
+Deeper internals: [Architecture](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?file=docs/ARCHITECTURE.md&branch=main) (more detailed than this map).
 
-Publish your ssh-key. you may need to replace id_rsa.pub with the correct public key file
+**Docs on gittr:** [Architecture](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?file=docs/ARCHITECTURE.md&branch=main) · [README](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?branch=main) · [SSH guide](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gitnostr?file=SSH_GIT_GUIDE.md&branch=main)
 
-```bash
-./bin/gn ssh-key add ~/.ssh/id_rsa.pub
-```
-
-Create a test repository and clone it. replace <publickey> with the hex represenation of your public key. If you are using a nip05 capable public key you can use the nip05 identifier instead.
-
-```bash
-./bin/gn repo create test
-./bin/gn repo clone  <publickey>:test
-```
+**gittr forge:** [arbadacarbaYK/gittr](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gittr?branch=main) · [bridge setup](https://gittr.space/npub1n2ph08n4pqz4d3jk6n2p35p2f4ldhc5g5tu7dhftfpueajf4rpxqfjhzmc/gittr?file=docs/GIT_NOSTR_BRIDGE_SETUP.md&branch=main)
 
-You can set write permission for your repository with the following command. replace <publickey> with the hex represenation of your public key. If you are using a nip05 capable public key you can use the nip05 identifier instead.
+**Build here (monorepo):**
 
 ```bash
-./bin/gn repo permissions test <publickey> WRITE
+make git-nostr-bridge git-nostr-ssh
+make git-nostr-cli   # gn
 ```