Skip to content

Commit b70629a

Browse files
committed
Merge branch 'dev' into feat/canceled-prompts-in-history
2 parents b7b016f + d366a14 commit b70629a

320 files changed

Lines changed: 15372 additions & 10015 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup-bun/action.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ description: "Setup Bun with caching and install dependencies"
33
runs:
44
using: "composite"
55
steps:
6-
- name: Mount Bun Cache
7-
if: ${{ runner.os == 'Linux' }}
8-
uses: useblacksmith/stickydisk@v1
6+
- name: Cache Bun dependencies
7+
uses: actions/cache@v4
98
with:
10-
key: ${{ github.repository }}-bun-cache-${{ runner.os }}
11-
path: ~/.bun
9+
path: ~/.bun/install/cache
10+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
11+
restore-keys: |
12+
${{ runner.os }}-bun-
1213
1314
- name: Setup Bun
1415
uses: oven-sh/setup-bun@v2

.github/workflows/nix-desktop.yml.disabled

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/nix-eval.yml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
name: nix-eval
2+
3+
on:
4+
push:
5+
branches: [dev]
6+
pull_request:
7+
branches: [dev]
8+
workflow_dispatch:
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
nix-eval:
19+
runs-on: blacksmith-4vcpu-ubuntu-2404
20+
timeout-minutes: 15
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v6
24+
25+
- name: Setup Nix
26+
uses: nixbuild/nix-quick-install-action@v34
27+
28+
- name: Evaluate flake outputs (all systems)
29+
run: |
30+
set -euo pipefail
31+
nix --version
32+
33+
echo "=== Flake metadata ==="
34+
nix flake metadata
35+
36+
echo ""
37+
echo "=== Flake structure ==="
38+
nix flake show --all-systems
39+
40+
SYSTEMS="x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin"
41+
PACKAGES="opencode"
42+
# TODO: move 'desktop' to PACKAGES when #11755 is fixed
43+
OPTIONAL_PACKAGES="desktop"
44+
45+
echo ""
46+
echo "=== Evaluating packages for all systems ==="
47+
for system in $SYSTEMS; do
48+
echo ""
49+
echo "--- $system ---"
50+
for pkg in $PACKAGES; do
51+
printf " %s: " "$pkg"
52+
if output=$(nix eval ".#packages.$system.$pkg.drvPath" --raw 2>&1); then
53+
echo "✓"
54+
else
55+
echo "✗"
56+
echo "::error::Evaluation failed for packages.$system.$pkg"
57+
echo "$output"
58+
exit 1
59+
fi
60+
done
61+
done
62+
63+
echo ""
64+
echo "=== Evaluating optional packages ==="
65+
for system in $SYSTEMS; do
66+
echo ""
67+
echo "--- $system ---"
68+
for pkg in $OPTIONAL_PACKAGES; do
69+
printf " %s: " "$pkg"
70+
if output=$(nix eval ".#packages.$system.$pkg.drvPath" --raw 2>&1); then
71+
echo "✓"
72+
else
73+
echo "✗"
74+
echo "::warning::Evaluation failed for packages.$system.$pkg"
75+
echo "$output"
76+
fi
77+
done
78+
done
79+
80+
echo ""
81+
echo "=== Evaluating devShells for all systems ==="
82+
for system in $SYSTEMS; do
83+
printf "%s: " "$system"
84+
if output=$(nix eval ".#devShells.$system.default.drvPath" --raw 2>&1); then
85+
echo "✓"
86+
else
87+
echo "✗"
88+
echo "::error::Evaluation failed for devShells.$system.default"
89+
echo "$output"
90+
exit 1
91+
fi
92+
done
93+
94+
echo ""
95+
echo "=== All evaluations passed ==="

.github/workflows/nix-hashes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66
on:
77
workflow_dispatch:
88
push:
9-
branches: [dev]
9+
branches: [dev, beta]
1010
paths:
1111
- "bun.lock"
1212
- "package.json"

.github/workflows/publish.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,23 @@ jobs:
171171
GH_TOKEN: ${{ github.token }}
172172
GITHUB_RUN_ID: ${{ github.run_id }}
173173

174+
- name: Resolve tauri portable SHA
175+
if: contains(matrix.settings.host, 'ubuntu')
176+
run: echo "TAURI_PORTABLE_SHA=$(git ls-remote https://github.com/tauri-apps/tauri.git refs/heads/feat/truly-portable-appimage | cut -f1)" >> "$GITHUB_ENV"
177+
174178
# Fixes AppImage build issues, can be removed when https://github.com/tauri-apps/tauri/pull/12491 is released
175179
- name: Install tauri-cli from portable appimage branch
180+
uses: taiki-e/cache-cargo-install-action@v3
176181
if: contains(matrix.settings.host, 'ubuntu')
177-
run: |
178-
cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch feat/truly-portable-appimage --force
179-
echo "Installed tauri-cli version:"
180-
cargo tauri --version
182+
with:
183+
tool: tauri-cli
184+
git: https://github.com/tauri-apps/tauri
185+
# branch: feat/truly-portable-appimage
186+
rev: ${{ env.TAURI_PORTABLE_SHA }}
187+
188+
- name: Show tauri-cli version
189+
if: contains(matrix.settings.host, 'ubuntu')
190+
run: cargo tauri --version
181191

182192
- name: Build and upload artifacts
183193
uses: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a

.opencode/agent/triage.md

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
mode: primary
33
hidden: true
4-
model: opencode/claude-haiku-4-5
4+
model: opencode/minimax-m2.5
55
color: "#44BA81"
66
tools:
77
"*": false
@@ -12,6 +12,8 @@ You are a triage agent responsible for triaging github issues.
1212

1313
Use your github-triage tool to triage issues.
1414

15+
This file is the source of truth for ownership/routing rules.
16+
1517
## Labels
1618

1719
### windows
@@ -43,12 +45,34 @@ Desktop app issues:
4345

4446
**Only** add if the issue explicitly mentions nix.
4547

48+
If the issue does not mention nix, do not add nix.
49+
50+
If the issue mentions nix, assign to `rekram1-node`.
51+
4652
#### zen
4753

4854
**Only** add if the issue mentions "zen" or "opencode zen" or "opencode black".
4955

5056
If the issue doesn't have "zen" or "opencode black" in it then don't add zen label
5157

58+
#### core
59+
60+
Use for core server issues in `packages/opencode/`, excluding `packages/opencode/src/cli/cmd/tui/`.
61+
62+
Examples:
63+
64+
- LSP server behavior
65+
- Harness behavior (agent + tools)
66+
- Feature requests for server behavior
67+
- Agent context construction
68+
- API endpoints
69+
- Provider integration issues
70+
- New, broken, or poor-quality models
71+
72+
#### acp
73+
74+
If the issue mentions acp support, assign acp label.
75+
5276
#### docs
5377

5478
Add if the issue requests better documentation or docs updates.
@@ -66,13 +90,51 @@ TUI issues potentially caused by our underlying TUI library:
6690

6791
When assigning to people here are the following rules:
6892

69-
adamdotdev:
70-
ONLY assign adam if the issue will have the "desktop" label.
93+
Desktop / Web:
94+
Use for desktop-labeled issues only.
95+
96+
- adamdotdevin
97+
- iamdavidhill
98+
- Brendonovich
99+
- nexxeln
100+
101+
Zen:
102+
ONLY assign if the issue will have the "zen" label.
103+
104+
- fwang
105+
- MrMushrooooom
106+
107+
TUI (`packages/opencode/src/cli/cmd/tui/...`):
108+
109+
- thdxr for TUI UX/UI product decisions and interaction flow
110+
- kommander for OpenTUI engine issues: rendering artifacts, keybind handling, terminal compatibility, SSH behavior, and low-level perf bottlenecks
111+
- rekram1-node for TUI bugs that are not clearly OpenTUI engine issues
112+
113+
Core (`packages/opencode/...`, excluding TUI subtree):
114+
115+
- thdxr for sqlite/snapshot/memory bugs and larger architectural core features
116+
- jlongster for opencode server + API feature work (tool currently remaps jlongster -> thdxr until assignable)
117+
- rekram1-node for harness issues, provider issues, and other bug-squashing
118+
119+
For core bugs that do not clearly map, either thdxr or rekram1-node is acceptable.
120+
121+
Docs:
122+
123+
- R44VC0RP
124+
125+
Windows:
126+
127+
- Hona (assign any issue that mentions Windows or is likely Windows-specific)
128+
129+
Determinism rules:
130+
131+
- If title + body does not contain "zen", do not add the "zen" label
132+
- If "nix" label is added but title + body does not mention nix/nixos, the tool will drop "nix"
133+
- If title + body mentions nix/nixos, assign to `rekram1-node`
134+
- If "desktop" label is added, the tool will override assignee and randomly pick one Desktop / Web owner
71135

72-
fwang:
73-
ONLY assign fwang if the issue will have the "zen" label.
136+
In all other cases, choose the team/section with the most overlap with the issue and assign a member from that team at random.
74137

75-
jayair:
76-
ONLY assign jayair if the issue will have the "docs" label.
138+
ACP:
77139

78-
In all other cases use best judgment. Avoid assigning to kommander needlessly, when in doubt assign to rekram1-node.
140+
- rekram1-node (assign any acp issues to rekram1-node)

0 commit comments

Comments
 (0)