gitsite: clean up redundant files, update README and jpkg.sexp for single binary
ober
ba7cc9357a8f6c8f97f74cd05dc7925471e064c9
--- a/README.md +++ b/README.md @@ -38,18 +38,17 @@ The server will start on `http://127.0.0.1:8080` by default. ### Create First User ```bash -jerboa tools/add-user.ss <username> <email> <password> +dist/gitsite add-user <username> <email> <password> ``` -### Build Static Binaries +### Build Static Binary ```bash make binary ``` This creates: -- `dist/gitsited` - Main web server -- `dist/gitsite-ssh` - SSH forced-command binary +- `dist/gitsite` - Single binary with subcommands (serve, ssh-auth, buildd, add-user, migrate) ## Configuration @@ -78,10 +77,9 @@ Edit `etc/gitsite.sexp`: sudo useradd -r -m -d /srv/gitsite -s /bin/bash gitsite ``` -2. **Install binaries**: +2. **Install binary**: ```bash - sudo install -m 755 dist/gitsited /usr/local/bin/ - sudo install -m 755 dist/gitsite-ssh /usr/local/bin/ + sudo install -m 755 dist/gitsite /usr/local/bin/ ``` 3. **Create directories**: @@ -125,7 +123,7 @@ Edit `etc/gitsite.sexp`: Type=simple User=gitsite WorkingDirectory=/srv/gitsite - ExecStart=/usr/local/bin/gitsited + ExecStart=/usr/local/bin/gitsite serve Restart=on-failure [Install] @@ -136,14 +134,14 @@ Edit `etc/gitsite.sexp`: 1. **Create SSH user**: ```bash - sudo useradd -r -m -d /srv/gitsite-ssh -s /usr/local/bin/gitsite-ssh gitsite-ssh + sudo useradd -r -m -d /srv/gitsite-ssh -s /usr/local/bin/gitsite ssh-auth gitsite-ssh ``` 2. **Configure sshd** (add to /etc/ssh/sshd_config): ``` Match User gitsite-ssh AuthorizedKeysFile /srv/gitsite/var/ssh/authorized_keys - ForceCommand /usr/local/bin/gitsite-ssh + ForceCommand /usr/local/bin/gitsite ssh-auth PermitTTY no AllowAgentForwarding no AllowTcpForwarding no @@ -162,7 +160,7 @@ Edit `etc/gitsite.sexp`: For asynchronous build execution: ```bash -sudo -u gitsite /usr/local/bin/gitsited-builds & +sudo -u gitsite /usr/local/bin/gitsite buildd & ``` Or create a separate systemd service: @@ -176,7 +174,7 @@ After=network.target gitsite.service Type=simple User=gitsite WorkingDirectory=/srv/gitsite -ExecStart=/usr/local/bin/gitsited-builds +ExecStart=/usr/local/bin/gitsite buildd Restart=on-failure [Install] @@ -201,14 +199,14 @@ git clone http://git.example.org/~username/repo.git **SSH** (requires SSH key): ```bash -git clone gitsite-ssh@git.example.org:~username/repo.git +git clone git@git.example.org:~username/repo.git ``` ### Push Changes **SSH** (recommended): ```bash -git remote set-url origin gitsite-ssh@git.example.org:~username/repo.git +git remote set-url origin git@git.example.org:~username/repo.git git push origin master ``` @@ -236,11 +234,12 @@ Builds are triggered automatically on push or manually via the web UI. ## Architecture - **Web server**: `(std net httpd)` with custom routing -- **Database**: SQLite via `(std db sqlite)` (pure Scheme implementation) -- **Authentication**: Argon2id password hashing, HMAC-signed session cookies -- **Git operations**: System `git` binary for wire protocol, libgit2 for browsing (future) +- **Database**: SQLite via `(std db sqlite)` (jsqlite pure-Scheme implementation) +- **Authentication**: Argon2id password hashing, server-side session records +- **Git operations**: System `git` binary for wire protocol, libgit2 for browsing (via jerboa-git Rust shim) - **Builds**: Synchronous execution in web thread (Phase 3), with job queue -- **SSH**: System OpenSSH with forced-command binary +- **SSH**: System OpenSSH with forced-command binary (`gitsite ssh-auth`) +- **TLS**: In-process termination via `httpd-start-https` (optional, config-driven) ## Limitations @@ -249,9 +248,9 @@ Builds are triggered automatically on push or manually via the web UI. - No webhooks - No LFS support - No syntax highlighting -- Builds execute synchronously (web request blocks) +- Builds execute synchronously (web request blocks) — async worker queue planned - No process-group isolation for builds (runaway builds must be killed manually) -- HTTPS push not supported (use SSH) +- HTTPS push not supported (use SSH) — binary-body support planned - No organizations or teams ## License --- a/jpkg.sexp +++ b/jpkg.sexp @@ -9,4 +9,4 @@ (dev-dependencies ()) (capabilities ((native-code reason: "sqlite engine and native runtime") (ffi libraries: ()) - (executables ("gitsited"))))) + (executables ("gitsite"))))) deleted file mode 100644 --- a/src/gitsite-ssh.ss +++ /dev/null @@ -1,92 +0,0 @@ -(import (jerboa prelude) - (std misc process) - (gitsite config) - (gitsite db) - (only (gitsite auth) lookup-ssh-key) - (only (gitsite repo) repo-path get-repo-by-owner-name)) - -(def (parse-git-command cmd) - (def parts (string-split cmd #\space)) - (if (< (length parts) 2) - #f - (let ([op (car parts)] - [path (cadr parts)]) - (cond - [(or (string=? op "git-upload-pack") (string=? op "git-receive-pack")) - (cons op path)] - [else #f])))) - -(def (extract-repo-info git-path) - (def cleaned (if (and (>= (string-length git-path) 2) - (string=? (substring git-path 0 1) "'") - (string=? (substring git-path (- (string-length git-path) 1) (string-length git-path)) "'")) - (substring git-path 1 (- (string-length git-path) 1)) - git-path)) - (def parts (string-split cleaned #\/)) - (if (< (length parts) 3) - #f - (let ([owner (list-ref parts (- (length parts) 3))] - [name (list-ref parts (- (length parts) 2))]) - (cons owner (if (string-suffix? ".git" name) - (substring name 0 (- (string-length name) 4)) - name))))) - -(def (check-permission uid owner name op) - (def repo (get-repo-by-owner-name owner name)) - (if (not repo) - #f - (let ([owner-id (cdr (assq 'owner_id repo))] - [vis (cdr (assq 'visibility repo))]) - (cond - [(string=? op "git-upload-pack") - (or (string=? vis "public") - (string=? vis "unlisted") - (= uid owner-id))] - [(string=? op "git-receive-pack") - (= uid owner-id)] - [else #f])))) - -(def (main) - (def ssh-cmd (getenv "SSH_ORIGINAL_COMMAND")) - (if (not ssh-cmd) - (begin - (displayln "error: no command") - (exit 1)) - (let ([parsed (parse-git-command ssh-cmd)]) - (if (not parsed) - (begin - (displayln "error: invalid command") - (exit 1)) - (let* ([op (car parsed)] - [git-path (cdr parsed)] - [repo-info (extract-repo-info git-path)]) - (if (not repo-info) - (begin - (displayln "error: invalid repository path") - (exit 1)) - (let* ([owner (car repo-info)] - [name (cdr repo-info)] - [fingerprint (getenv "SSH_KEY_FINGERPRINT")]) - (if (not fingerprint) - (begin - (displayln "error: no ssh key fingerprint") - (exit 1)) - (let ([uid (lookup-ssh-key fingerprint)]) - (if (not uid) - (begin - (displayln "error: unknown ssh key") - (exit 1)) - (if (not (check-permission uid owner name op)) - (begin - (displayln "error: permission denied") - (exit 1)) - (let ([repo-path (repo-path owner name)]) - (config-init! "etc/gitsite.sexp") - (db-init! (cfg-db-path)) - (def cmd (str op " " (shell-quote repo-path))) - (exit (system cmd)))))))))))))) - -(def (shell-quote s) - (str "'" (string-replace s "'" "'\\''") "'")) - -(main) deleted file mode 100644 --- a/src/gitsited-builds.ss +++ /dev/null @@ -1,21 +0,0 @@ -(import (jerboa prelude) - (only (std misc thread) thread-sleep! spawn) - (gitsite config) - (gitsite db) - (only (gitsite worker) worker-loop)) - -(config-init! "etc/gitsite.sexp") -(db-init! (cfg-db-path)) - -(def num-workers 2) - -(let spawn-workers ([i 0]) - (when (< i num-workers) - (spawn (lambda () (worker-loop (str "worker-" (number->string i))))) - (spawn-workers (+ i 1)))) - -(displayln "buildsd started with " num-workers " workers") - -(let loop () - (thread-sleep! 3600) - (loop)) deleted file mode 100644 --- a/src/gitsited.ss +++ /dev/null @@ -1,18 +0,0 @@ -(import (jerboa prelude) - (std net httpd) - (only (std misc thread) thread-sleep!) - (gitsite config) - (gitsite db) - (gitsite web)) - -(def (run-forever) - (let loop () - (thread-sleep! 3600) - (loop))) - -(config-init! "etc/gitsite.sexp") -(db-init! (cfg-db-path)) -(def server (httpd-start (list 'port (cfg-port) 'address (cfg-address)) (make-handler))) -(displayln "gitsite listening on http://" (cfg-address) ":" (cfg-port)) -(displayln "database: " (cfg-db-path)) -(run-forever) new file mode 100644 --- /dev/null +++ b/todo @@ -0,0 +1,2848 @@ +# gitsite + +**Session ID:** ses_04ad843d3ffeepFkGi0GID0z5m +**Created:** 7/30/2026, 4:31:48 PM +**Updated:** 7/30/2026, 8:38:52 PM + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 9.4s) + +_Thinking:_ + +Now let me rebuild and test again. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in foreign-procedure: no entry for "jgit" + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 14.4s) + +_Thinking:_ + +Still failing. The issue must be that when the module is loaded, the load-shared-object isn't being called, or it's being called but the library isn't staying loaded. + +Let me check if the issue is that the library path is wrong when the module is loaded from a different directory. The test is running from /tmp but the module expects to be run from the project directory. + +Actually, I'm using (current-directory) which should give the current working directory. But when jerbuild exec runs the test, what's the current directory? + +Let me try a different approach - use a hardcoded absolute path for now to debug this. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Load the jerboa-git native library using absolute path\n(load-shared-object \"/Users/user/mine/jerboa-gitsite/vendor/jerboa-git/native/target/release/libjerboa_git_shim.dylib\")", + "oldString": ";; Load the jerboa-git native library using absolute path\n(load-shared-object (path-join (current-directory) \"vendor/jerboa-git/native/target/release/libjerboa_git_shim.dylib\"))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 12.3s) + +_Thinking:_ + +Now let me rebuild and test with the hardcoded absolute path. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in foreign-procedure: no entry for "jgit" + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 33.9s) + +_Thinking:_ + +Still failing. This is strange - the library loads fine in the standalone test but not when loaded from the module. + +Let me check if maybe the issue is that the module is being compiled/cached and the load-shared-object isn't being re-executed. Let me try cleaning the build and rebuilding. + +Actually, wait - I should check if the load-shared-object is even being called. Let me add a debug print to see if it's executing. + +Actually, I think I see the issue now. When jerbuild transpiles the module, it might be evaluating the load-shared-object at compile time, not runtime. Or the library handle might not be persisting. + +Let me try a different approach - instead of loading the library at module top-level, let me load it lazily when the first git function is called. + + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Load the jerboa-git native library lazily on first use\n(def *git-lib-loaded* #f)\n(def *jgit-proc* #f)\n\n(def (ensure-git-lib-loaded)\n (unless *git-lib-loaded*\n (load-shared-object \"/Users/user/mine/jerboa-gitsite/vendor/jerboa-git/native/target/release/libjerboa_git_shim.dylib\")\n (set! *jgit-proc* (foreign-procedure \"jgit\" (u8* int) string))\n (set! *git-lib-loaded* #t)))\n\n;; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (if (hash-ref res 'ok)\n (hash-ref res 'data)\n (error 'git (hash-ref res 'error)))))", + "oldString": ";; Load the jerboa-git native library using absolute path\n(load-shared-object \"/Users/user/mine/jerboa-gitsite/vendor/jerboa-git/native/target/release/libjerboa_git_shim.dylib\")\n\n;; FFI binding to jerboa-git shim - returns C string directly\n(def jgit\n (foreign-procedure \"jgit\" (u8* int) string))\n\n;; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (jgit req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (if (hash-ref res 'ok)\n (hash-ref res 'data)\n (error 'git (hash-ref res 'error)))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 13.0s) + +_Thinking:_ + +Now let me rebuild and test with the lazy loading approach. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in hash-ref: key not found with irritant ok + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 42.6s) + +_Thinking:_ + +Good progress! The library is now loading successfully. The error "key not found with irritant ok" means the response doesn't have an 'ok' key. This suggests the response format might be different than expected, or there's an error in the response. + +Let me add some debug output to see what the actual response is. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n (if (hash-ref res 'ok #f)\n (hash-ref res 'data)\n (error 'git (hash-ref res 'error \"unknown error\")))))", + "oldString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (if (hash-ref res 'ok)\n (hash-ref res 'data)\n (error 'git (hash-ref res 'error)))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 19.0s) + +_Thinking:_ + +I added a default value #f to hash-ref for 'ok, and also added better error handling. Let me rebuild and test again. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in git: unknown error + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 15.0s) + +_Thinking:_ + +The error is "unknown error" which means the response doesn't have an 'error key either. Let me add more debug output to see what the actual response looks like. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))", + "oldString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n (if (hash-ref res 'ok #f)\n (hash-ref res 'data)\n (error 'git (hash-ref res 'error \"unknown error\")))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 8.1s) + +_Thinking:_ + +Now the error will include the actual response hash table if there's no 'ok or 'error key. Let me rebuild and test. + + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in git: unknown error with irritant #<hashtable> + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 16.7s) + +_Thinking:_ + +The response is a hash table but doesn't have 'ok or 'error keys. This is strange. Let me print the actual hash table contents to debug. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n ;; Debug: print the response\n (displayln \"DEBUG response: \" res)\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))", + "oldString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 8.3s) + +_Thinking:_ + +Now let me rebuild and test to see the actual response. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +DEBUG response: #<hashtable> +Exception in git: unknown error with irritant #<hashtable> + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 17.3s) + +_Thinking:_ + +The hash table is printing as #<hashtable> which doesn't show the contents. Let me use a different approach to print the hash table keys. + + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n ;; Debug: print the response keys\n (displayln \"DEBUG response keys: \" (hash-keys res))\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))", + "oldString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n ;; Debug: print the response\n (displayln \"DEBUG response: \" res)\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 9.1s) + +_Thinking:_ + +Let me rebuild and test to see the keys. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +DEBUG response keys: (data ok) +Exception in git: unknown error with irritant #<hashtable> + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 24.7s) + +_Thinking:_ + +Ah! The keys are (data ok) which means the hash table uses string keys "data" and "ok", not symbol keys 'data and 'ok. The JSON parser is creating string keys, not symbol keys. I need to use string keys in hash-ref. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n ;; JSON parser creates string keys, not symbol keys\n (let ([ok (hash-ref res \"ok\" #f)])\n (if ok\n (hash-ref res \"data\")\n (let ([err (hash-ref res \"error\" #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))", + "oldString": ";; Helper to call jgit and parse JSON response\n(def (jgit-call cmd cwd args)\n (ensure-git-lib-loaded)\n (let* ([req-ht (make-hash-table)]\n [_ (begin\n (hash-put! req-ht 'cmd cmd)\n (hash-put! req-ht 'cwd cwd)\n (hash-put! req-ht 'args args))]\n [req (with-output-to-string\n (lambda ()\n (write-json req-ht)))]\n [req-bv (string->utf8 req)]\n [res-str (*jgit-proc* req-bv (bytevector-length req-bv))]\n [res (with-input-from-string res-str read-json)])\n (when (not (hash-table? res))\n (error 'git \"response is not a hash table\" res))\n ;; Debug: print the response keys\n (displayln \"DEBUG response keys: \" (hash-keys res))\n (let ([ok (hash-ref res 'ok #f)])\n (if ok\n (hash-ref res 'data)\n (let ([err (hash-ref res 'error #f)])\n (if err\n (error 'git err)\n (error 'git \"unknown error\" res)))))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 33.3s) + +_Thinking:_ + +Now let me rebuild and test with string keys. + + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Exception in hash-ref: key not found with irritant commits + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 9.2s) + +_Thinking:_ + +Good! Now we're getting past the ok/data check, but the data doesn't have a 'commits key. Let me check what keys the data hash table has. + + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": "(def (git-log repo-path rev limit offset)\n (let ([args (make-hash-table)])\n (hash-put! args 'rev rev)\n (hash-put! args 'max limit)\n (hash-put! args 'offset offset)\n (let ([data (jgit-call \"log\" repo-path args)])\n (displayln \"DEBUG data keys: \" (hash-keys data))\n (hash-ref data 'commits))))", + "oldString": "(def (git-log repo-path rev limit offset)\n (let ([args (make-hash-table)])\n (hash-put! args 'rev rev)\n (hash-put! args 'max limit)\n (hash-put! args 'offset offset)\n (let ([data (jgit-call \"log\" repo-path args)])\n (hash-ref data 'commits))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 6.7s) + +_Thinking:_ + +Let me rebuild and test to see the data keys. + + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +DEBUG data keys: (next_offset commits truncated) +Exception in hash-ref: key not found with irritant commits + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 35.5s) + +_Thinking:_ + +Same issue - the data hash table has string keys "commits", "truncated", "next_offset", not symbol keys. I need to use string keys throughout. + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": "(def (git-log repo-path rev limit offset)\n (let ([args (make-hash-table)])\n (hash-put! args 'rev rev)\n (hash-put! args 'max limit)\n (hash-put! args 'offset offset)\n (let ([data (jgit-call \"log\" repo-path args)])\n (hash-ref data \"commits\"))))", + "oldString": "(def (git-log repo-path rev limit offset)\n (let ([args (make-hash-table)])\n (hash-put! args 'rev rev)\n (hash-put! args 'max limit)\n (hash-put! args 'offset offset)\n (let ([data (jgit-call \"log\" repo-path args)])\n (displayln \"DEBUG data keys: \" (hash-keys data))\n (hash-ref data 'commits))))" +} +``` + +**Output:** +``` +Edit applied successfully. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 7.9s) + +_Thinking:_ + +Now let me rebuild and test again. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && make build >/dev/null 2>&1 && JERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Got 1 commits +Exception: invalid context for definition (define first-commit (list-ref log-result 0)) at line 10, char 3 of /tmp/test-git-ops.ss + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 13.5s) + +_Thinking:_ + +Great! git-log is working now. The error is in the test script, not in git.ss. Let me fix the test script. + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && cat > /tmp/test-git-ops.ss << 'EOF'\n(import (jerboa prelude) (gitsite git))\n\n(displayln \"Testing git operations on /Users/user/mine/jerboa-git...\")\n\n;; Test git-log\n(displayln \"\\n=== git-log ===\")\n(define log-result (git-log \"/Users/user/mine/jerboa-git\" \"HEAD\" 5 0))\n(displayln \"Got \" (length log-result) \" commits\")\n(when (> (length log-result) 0)\n (let ([first-commit (list-ref log-result 0)])\n (displayln \"First: \" (hash-ref first-commit \"short\") \" - \" (hash-ref first-commit \"summary\"))))\n\n;; Test git-refs\n(displayln \"\\n=== git-refs ===\")\n(define refs (git-refs \"/Users/user/mine/jerboa-git\"))\n(define branches (hash-ref refs 'branches))\n(define tags (hash-ref refs 'tags))\n(displayln \"Branches: \" branches)\n(displayln \"Tags: \" tags)\n\n;; Test git-show\n(when (> (length log-result) 0)\n (displayln \"\\n=== git-show ===\")\n (let ([first-sha (hash-ref (list-ref log-result 0) \"id\")])\n (define show-result (git-show \"/Users/user/mine/jerboa-git\" first-sha))\n (displayln \"Show result keys: \" (hash-keys show-result))))\n\n(displayln \"\\n✓ All git operations working!\")\nEOF\nJERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Got 1 commits +First: bd5d473 - Initial import of jerboa-git + +=== git-refs === +Exception in hashtable-ref: ((branches . #<hashtable>) (tags . #<hashtable>)) is not a hashtable + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 11.0s) + +_Thinking:_ + +git-log is working! Now git-refs has an issue. The problem is that git-refs is returning an alist with 'branches and 'tags keys, but the values are hash tables from jgit, not lists. Let me check what jgit returns for branch-list and tag-list. + +Actually, looking at the error, refs is an alist ((branches . #<hashtable>) (tags . #<hashtable>)), so hash-ref refs 'branches should work. But the error says refs is not a hashtable. Oh wait, I'm using hash-ref on an alist. I should use assq or cdr/assq instead. + +Let me fix git-refs to return proper data structures. + + +**Tool: edit** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/git.ss", + "newString": "(def (git-refs repo-path)\n (let ([branches (jgit-call \"branch-list\" repo-path (make-hash-table))]\n [tags (jgit-call \"tag-list\" repo-path (make-hash-table))])\n (list (cons 'branches branches)\n (cons 'tags tags))))", + "oldString": "(def (git-refs repo-path)\n (let ([branches (jgit-call \"branch-list\" repo-path (make-hash-table))]\n [tags (jgit-call \"tag-list\" repo-path (make-hash-table))])\n (list (cons 'branches branches)\n (cons 'tags tags))))" +} +``` + +**Error:** +``` +No changes to apply: oldString and newString are identical. +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 14.3s) + +_Thinking:_ + +The git-refs function is fine. The issue is in the test script - I'm using hash-ref on an alist. Let me fix the test script to use assq/cdr instead. + + +**Tool: bash** + +**Input:** +```json +{ + "command": "cd /Users/user/mine/jerboa-gitsite && cat > /tmp/test-git-ops.ss << 'EOF'\n(import (jerboa prelude) (gitsite git))\n\n(displayln \"Testing git operations on /Users/user/mine/jerboa-git...\")\n\n;; Test git-log\n(displayln \"\\n=== git-log ===\")\n(define log-result (git-log \"/Users/user/mine/jerboa-git\" \"HEAD\" 5 0))\n(displayln \"Got \" (length log-result) \" commits\")\n(when (> (length log-result) 0)\n (let ([first-commit (list-ref log-result 0)])\n (displayln \"First: \" (hash-ref first-commit \"short\") \" - \" (hash-ref first-commit \"summary\"))))\n\n;; Test git-refs\n(displayln \"\\n=== git-refs ===\")\n(define refs (git-refs \"/Users/user/mine/jerboa-git\"))\n(define branches (cdr (assq 'branches refs)))\n(define tags (cdr (assq 'tags refs)))\n(displayln \"Branches: \" branches)\n(displayln \"Tags: \" tags)\n\n;; Test git-show\n(when (> (length log-result) 0)\n (displayln \"\\n=== git-show ===\")\n (let ([first-sha (hash-ref (list-ref log-result 0) \"id\")])\n (define show-result (git-show \"/Users/user/mine/jerboa-git\" first-sha))\n (displayln \"Show result keys: \" (hash-keys show-result))))\n\n(displayln \"\\n✓ All git operations working!\")\nEOF\nJERBOA_HOME=$(jerboa jerbuild --jerboa-home 2>/dev/null) && jerboa jerbuild exec --libdirs \"build/lib:$JERBOA_HOME/lib:vendor/jsqlite\" /tmp/test-git-ops.ss 2>&1" +} +``` + +**Output:** +``` +Testing git operations on /Users/user/mine/jerboa-git... + +=== git-log === +Got 1 commits +First: bd5d473 - Initial import of jerboa-git + +=== git-refs === +Branches: #<hashtable> +Tags: #<hashtable> + +=== git-show === +Show result keys: (time patch id author email truncated message) + +✓ All git operations working! + +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 12.0s) + +_Thinking:_ + +Excellent! All git operations are working now. The branches and tags are hash tables from jgit, which is fine. Now let me update the repo.ss module to use the new git.ss module instead of shelling out to the git binary. This will make the code more portable and eliminate the dependency on the system git binary. + +Let me check what functions repo.ss currently uses from the git binary and update them to use git.ss instead. + +Perfect! The jerboa-git FFI integration is working. Now let me update repo.ss to use the native git operations instead of shelling out to the git binary. + + + +**Tool: read** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/repo.ss", + "limit": 50 +} +``` + +**Output:** +``` +<path>/Users/user/mine/jerboa-gitsite/src/gitsite/repo.ss</path> +<type>file</type> +<content> +1: (import (jerboa prelude) +2: (std misc process) +3: (only (gitsite db) db-query db-execute db-insert) +4: (only (gitsite util) now-iso ensure-dir!) +5: (only (gitsite config) cfg-repos-root cfg-public-url)) +6: +7: (export repo-path create-repo! get-repo get-repo-by-owner-name +8: list-public-repos list-user-repos set-visibility! delete-repo! +9: git-log git-commit git-blob git-ls-tree git-refs git-readme) +10: +11: (def (keep-nonempty-rest h t) +12: (if (string=? h "") +13: (keep-nonempty t) +14: (cons h (keep-nonempty t)))) +15: +16: (def (keep-nonempty lst) +17: (if (null? lst) +18: '() +19: (keep-nonempty-rest (car lst) (cdr lst)))) +20: +21: (def (git-run path . args) +22: (let ([argv (append (list "git" (str "--git-dir=" path) "--no-pager") args)]) +23: (try +24: (string-trim (run-process argv)) +25: (catch (e) "")))) +26: +27: (def (git-lines path . args) +28: (keep-nonempty (string-split (apply git-run path args) #\newline))) +29: +30: (def (repo-path owner name) +31: (path-join (cfg-repos-root) owner (str name ".git"))) +32: (def (install-hook! path owner name) +33: (def hook (str "#!/bin/sh\n" +34: "while read old new ref; do\n" +35: " case \"$ref\" in\n" +36: " refs/heads/*)\n" +37: " curl -s -X POST -d \"owner=" owner "&repo=" name "&sha=$new\" \"" +38: (cfg-public-url) "/internal/hooks/post-receive\" >/dev/null 2>&1 || true\n" +39: " ;;\n" +40: " esac\n" +41: "done\n")) +42: (def hook-path (path-join path "hooks" "post-receive")) +43: (write-file-string hook-path hook) +44: (system (str "chmod +x '" hook-path "'"))) +45: +46: (def (create-repo-do! owner-id owner-name name description visibility) +47: (let ([path (repo-path owner-name name)]) +48: (ensure-dir! (path-join (cfg-repos-root) owner-name)) +49: (let ([ok (try +50: (begin + +(Showing lines 1-50 of 212. Use offset=51 to continue.) +</content> +``` + +--- + +## Assistant (Build · Qwen3.7 Plus (Alibaba MaaS) · 8.0s) + +_Thinking:_ + +I can see that repo.ss currently has its own git-log, git-commit, git-blob, git-ls-tree, git-refs, and git-readme functions that shell out to the git binary. I need to replace these with imports from the new git.ss module. + +Let me read more of repo.ss to see all the git-related functions. + +**Tool: read** + +**Input:** +```json +{ + "filePath": "/Users/user/mine/jerboa-gitsite/src/gitsite/repo.ss", + "offset": 100 +} +``` + +**Output:** +``` +<path>/Users/user/mine/jerboa-gitsite/src/gitsite/repo.ss</path> +<type>file</type> +<content> +100: (cons 'name (cadr row)) +101: (cons 'description (caddr row)))) +102: +103: (def (list-public-repos) +104: (map repo-summary-from-row +105: (db-query "SELECT u.name, r.name, r.description FROM repos r JOIN users u ON u.id = r.owner_id WHERE r.visibility = 'public' ORDER BY r.created_at DESC LIMIT 50"))) +106: +107: (def (list-user-repos owner-name) +108: (map repo-summary-from-row +109: (db-query "SELECT u.name, r.name, r.description FROM repos r JOIN users u ON u.id = r.owner_id WHERE u.name = ? AND r.visibility = 'public' ORDER BY r.created_at DESC" owner-name))) +110: +111: (def (set-visibility! repo-id vis) +112: (db-execute "UPDATE repos SET visibility = ? WHERE id = ?" vis repo-id)) +113: