Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
8238a70
Add GitHub App merge queue: edge function, schema, and dashboard UI
claude Jul 14, 2026
d5a8169
Add merge queue integration to Tauri desktop app
claude Jul 14, 2026
26ff4ea
fix: format, type errors, and ast-grep snapshots for CI
claude Jul 14, 2026
82faac1
feat: use gh CLI for PR lookup before falling back to GH app proxy
claude Jul 15, 2026
a26719a
chore: restore web files from main (jsonLdPlugin and DocItem layout)
claude Jul 15, 2026
20795f0
test: add Rust and JS integration tests for gh CLI PR lookup
claude Jul 15, 2026
540dd46
feat: add GitHub integration panel with Issues and PR CRUD via gh CLI
claude Jul 15, 2026
5759b20
feat(db): add pgmq queues, webhook receipts, command executions and q…
claude Jul 16, 2026
eb18f61
refactor(queue): extract message contracts, pure state machine and sh…
claude Jul 16, 2026
1d94d79
feat(queue): publish merge queue commands from GitHub webhooks
claude Jul 16, 2026
bcc64eb
feat(queue): add PGMQ merge queue worker with retry and dead-letter f…
claude Jul 16, 2026
ff2eee1
fix(queue): resolve configuration by PR target branch in enqueue-work…
claude Jul 16, 2026
5b8b590
feat(queue): add periodic reconciler for stale merge queue state
claude Jul 16, 2026
1ba650b
fix(github): secure installation linking flow
claude Jul 16, 2026
fb30911
test(queue): add unit coverage for state machine, scheduler, retries …
claude Jul 16, 2026
7ff7ec9
docs(queue): document merge queue architecture, deployment and operat…
claude Jul 16, 2026
49d2ba5
fix: wire gh_* commands into NAPI dispatch and fix hoisted mock
claude Jul 16, 2026
cf790f5
fix: make useEnqueueWorkspace tests actually wait for remoteInfo
claude Jul 16, 2026
78a4b45
Merge branch 'main' into claude/github-merge-queue-app-t2e9fp
Ziinc Jul 17, 2026
9174618
feat: improvements to github integeration
Ziinc Jul 26, 2026
5c0ea66
Add GitHub App merge queue: edge function, schema, and dashboard UI
claude Jul 14, 2026
8e0c342
Add merge queue integration to Tauri desktop app
claude Jul 14, 2026
a46fbe0
fix: format, type errors, and ast-grep snapshots for CI
claude Jul 14, 2026
a9a7133
feat: use gh CLI for PR lookup before falling back to GH app proxy
claude Jul 15, 2026
ff15e62
test: add Rust and JS integration tests for gh CLI PR lookup
claude Jul 15, 2026
0c3e755
feat: add GitHub integration panel with Issues and PR CRUD via gh CLI
claude Jul 15, 2026
e590d10
feat(db): add pgmq queues, webhook receipts, command executions and q…
claude Jul 16, 2026
62ba087
refactor(queue): extract message contracts, pure state machine and sh…
claude Jul 16, 2026
0d4d72b
feat(queue): publish merge queue commands from GitHub webhooks
claude Jul 16, 2026
0b8acd3
feat(queue): add PGMQ merge queue worker with retry and dead-letter f…
claude Jul 16, 2026
4d5a6f0
fix(queue): resolve configuration by PR target branch in enqueue-work…
claude Jul 16, 2026
f0a8986
feat(queue): add periodic reconciler for stale merge queue state
claude Jul 16, 2026
e4df650
fix(github): secure installation linking flow
claude Jul 16, 2026
db3b191
test(queue): add unit coverage for state machine, scheduler, retries …
claude Jul 16, 2026
e3dbc9c
docs(queue): document merge queue architecture, deployment and operat…
claude Jul 16, 2026
a85a94b
fix: wire gh_* commands into NAPI dispatch and fix hoisted mock
claude Jul 16, 2026
26717db
fix: make useEnqueueWorkspace tests actually wait for remoteInfo
claude Jul 16, 2026
4f1931f
feat: improvements to github integeration
Ziinc Jul 26, 2026
9ff745d
chore: migration fixes
Ziinc Jul 27, 2026
6c97655
Merge branch 'claude/github-merge-queue-app-t2e9fp' of github.com:Zii…
Ziinc Jul 27, 2026
d6d78ec
chore: adjust functions deployment script
Ziinc Jul 27, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,28 @@ on:
paths:
- "src/**"
- "src-tauri/**"
- "crates/treq-napi/**"
- "supabase/**"
- "web/**"
- "test/**"
- "Cargo.toml"
- "Cargo.lock"
- "package.json"
- "package-lock.json"
- ".github/workflows/ci.yml"
pull_request:
branches: [main]
paths:
- "src/**"
- "src-tauri/**"
- "crates/treq-napi/**"
- "supabase/**"
- "web/**"
- "test/**"
- "Cargo.toml"
- "Cargo.lock"
- "package.json"
- "package-lock.json"
- ".github/workflows/ci.yml"

jobs:
Expand Down Expand Up @@ -62,11 +78,11 @@ jobs:
sudo apt-get install -y git
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf

- name: Install git and jj CLI (macOS)
- name: Install git, jj, and gh CLI (macOS)
if: matrix.platform == 'macos-latest'
run: |
brew update
brew install git jj
brew install git jj gh
echo "$(brew --prefix)/bin" >> $GITHUB_PATH

- name: Install jj CLI (ubuntu)
Expand All @@ -75,10 +91,23 @@ jobs:
cargo binstall --strategies crate-meta-data jj-cli
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

- name: Install gh CLI (ubuntu)
if: matrix.platform == 'ubuntu-22.04'
run: |
(type -p wget >/dev/null || (sudo apt-get update && sudo apt-get install -y wget)) \
&& sudo mkdir -p -m 755 /etc/apt/keyrings \
&& out=$(mktemp) && wget -nv -O$out https://cli.github.com/packages/githubcli-archive-keyring.gpg \
&& cat $out | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
&& sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
&& sudo apt-get update \
&& sudo apt-get install -y gh

- name: Verify pinned tool versions
run: |
git --version
jj --version
gh --version

- name: Install dependencies
run: npm ci
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/web-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- main
paths:
- "web/src/**"
- "web/e2e/**"
- "web/package.json"
- "web/package-lock.json"
- "web/playwright.config.ts"
- ".github/workflows/web-e2e.yml"

defaults:
Expand Down
33 changes: 32 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,35 @@ bump:
perl -0pi -e 's/"version": "[^"]*"/"version": "'"$$NEW"'"/' src-tauri/tauri.conf.json; \
perl -0pi -e 's/^version = "[^"]*"/version = "'"$$NEW"'"/m' src-tauri/Cargo.toml; \
(cd src-tauri && cargo update -p treq 2>/dev/null) || true; \
echo "Done."
echo "Done."

stop:
supabase stop

restart:
$(MAKE) stop
$(MAKE) start

db.reset:
supabase db reset --local

db.diff:
@NAME="$(NAME)"; \
if [ -z "$$NAME" ]; then \
printf "Migration name: "; \
read NAME; \
fi; \
if [ -z "$$NAME" ]; then echo "No migration name entered, aborting."; exit 1; fi; \
supabase db diff --local --file "$$NAME"


deploy:
@echo 'Deploying DB migrations now'
@supabase db push
@echo 'Deploying functions now'
@for entrypoint in supabase/functions/*/index.ts; do \
function_dir=$${entrypoint%/index.ts}; \
supabase functions deploy "$${function_dir##*/}" || exit $$?; \
done

.PHONY: bump start db.ßdiff deploy restart db.reset stop
Loading
Loading