Resolve merge conflicts

.opencode/agent/translator.md

@@ -359,6 +359,7 @@ opencode serve --hostname 0.0.0.0 --port 4096
 opencode serve [--port <number>] [--hostname <string>] [--cors <origin>]
 opencode session [command]
 opencode session list
+opencode session delete <sessionID>
 opencode stats
 opencode uninstall
 opencode upgrade
@@ -565,7 +566,7 @@ NODE_ENV
 NODE_EXTRA_CA_CERTS
 NPM_AUTH_TOKEN
 OC_ALLOW_WAYLAND
-OPENCODE_API_KEY
+KILO_API_KEY
 KILO_AUTH_JSON
 KILO_AUTO_SHARE
 KILO_CLIENT
@@ -598,6 +599,7 @@ KILO_EXPERIMENTAL_MARKDOWN
 KILO_EXPERIMENTAL_OUTPUT_TOKEN_MAX
 KILO_EXPERIMENTAL_OXFMT
 KILO_EXPERIMENTAL_PLAN_MODE
+KILO_ENABLE_QUESTION_TOOL
 KILO_FAKE_VCS
 KILO_GIT_BASH_PATH
 KILO_MODEL

.opencode/agent/triage.md

@@ -1,7 +1,7 @@
 ---
 mode: primary
 hidden: true
-model: opencode/claude-haiku-4-5
+model: opencode/minimax-m2.5
 color: "#44BA81"
 tools:
   "*": false
@@ -12,6 +12,8 @@ You are a triage agent responsible for triaging github issues.
 
 Use your github-triage tool to triage issues.
 
+This file is the source of truth for ownership/routing rules.
+
 ## Labels
 
 ### windows
@@ -43,12 +45,34 @@ Desktop app issues:
 
 **Only** add if the issue explicitly mentions nix.
 
+If the issue does not mention nix, do not add nix.
+
+If the issue mentions nix, assign to `rekram1-node`.
+
 #### zen
 
 **Only** add if the issue mentions "zen" or "opencode zen" or "opencode black".
 
 If the issue doesn't have "zen" or "opencode black" in it then don't add zen label
 
+#### core
+
+Use for core server issues in `packages/opencode/`, excluding `packages/opencode/src/cli/cmd/tui/`.
+
+Examples:
+
+- LSP server behavior
+- Harness behavior (agent + tools)
+- Feature requests for server behavior
+- Agent context construction
+- API endpoints
+- Provider integration issues
+- New, broken, or poor-quality models
+
+#### acp
+
+If the issue mentions acp support, assign acp label.
+
 #### docs
 
 Add if the issue requests better documentation or docs updates.
@@ -66,13 +90,51 @@ TUI issues potentially caused by our underlying TUI library:
 
 When assigning to people here are the following rules:
 
-adamdotdev:
-ONLY assign adam if the issue will have the "desktop" label.
+Desktop / Web:
+Use for desktop-labeled issues only.
 
-fwang:
-ONLY assign fwang if the issue will have the "zen" label.
+- adamdotdevin
+- iamdavidhill
+- Brendonovich
+- nexxeln
 
-jayair:
-ONLY assign jayair if the issue will have the "docs" label.
+Zen:
+ONLY assign if the issue will have the "zen" label.
 
-In all other cases use best judgment. Avoid assigning to kommander needlessly, when in doubt assign to rekram1-node.
+- fwang
+- MrMushrooooom
+
+TUI (`packages/opencode/src/cli/cmd/tui/...`):
+
+- thdxr for TUI UX/UI product decisions and interaction flow
+- kommander for OpenTUI engine issues: rendering artifacts, keybind handling, terminal compatibility, SSH behavior, and low-level perf bottlenecks
+- rekram1-node for TUI bugs that are not clearly OpenTUI engine issues
+
+Core (`packages/opencode/...`, excluding TUI subtree):
+
+- thdxr for sqlite/snapshot/memory bugs and larger architectural core features
+- jlongster for opencode server + API feature work (tool currently remaps jlongster -> thdxr until assignable)
+- rekram1-node for harness issues, provider issues, and other bug-squashing
+
+For core bugs that do not clearly map, either thdxr or rekram1-node is acceptable.
+
+Docs:
+
+- R44VC0RP
+
+Windows:
+
+- Hona (assign any issue that mentions Windows or is likely Windows-specific)
+
+Determinism rules:
+
+- If title + body does not contain "zen", do not add the "zen" label
+- If "nix" label is added but title + body does not mention nix/nixos, the tool will drop "nix"
+- If title + body mentions nix/nixos, assign to `rekram1-node`
+- If "desktop" label is added, the tool will override assignee and randomly pick one Desktop / Web owner
+
+In all other cases, choose the team/section with the most overlap with the issue and assign a member from that team at random.
+
+ACP:
+
+- rekram1-node (assign any acp issues to rekram1-node)