Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Run Worktrunk Tend workflows with Codex on gpt-6-sol (#4240)
Maximilian Roos45d9b4e84287
diff --git a/.claude/skills/running-tend/SKILL.md b/.claude/skills/running-tend/SKILL.mdindex 8427ac55f..e2bdf7097 100644--- a/.claude/skills/running-tend/SKILL.md+++ b/.claude/skills/running-tend/SKILL.md@@ -8,15 +8,13 @@ metadata:# Worktrunk Tend CIProject-specific guidance for tend workflows running on worktrunk (a Rust-CLI for managing git worktrees). The generic skills-(`/tend-ci-runner:run-tend`, `/tend-ci-runner:review`,-`/tend-ci-runner:triage`, etc.) provide the workflow framework; this skill-adds worktrunk conventions.+CLI for managing git worktrees). The bundled `run-tend`, `review`, and `triage`+skills provide the workflow framework; this skill adds worktrunk conventions.## Filing issues in other reposStanding exception granted: file directly in agent-equipped targets (per-**Filing issues** in the bundled `/tend-ci-runner:act-in-other-repos` skill)+**Filing issues** in the bundled `act-in-other-repos` skill)without asking permission here first. The default rule (open an issue here askingpermission first) still applies when the target shows no agent signals.@@ -79,7 +77,7 @@ CI runs on Linux, Windows, and macOS.A test that leans on inherited state — the process CWD, an ambient env var —sets up its own instead, via `TestRepo::with_initial_commit()` plus a tempdir,the way most worktrunk tests already do. Guarding it with an early return-(**Don't "fix" tests by adding skip guards** in `/tend-ci-runner:fix-a-bug`)+(**Don't "fix" tests by adding skip guards** in the bundled `fix-a-bug` skill)drops the coverage rather than restoring it. This governs every workflow thatfixes a test here, not just issue triage.diff --git a/.config/tend.yaml b/.config/tend.yamlindex b1786999f..8cef39c43 100644--- a/.config/tend.yaml+++ b/.config/tend.yaml@@ -1,4 +1,8 @@bot_name: worktrunk-bot+harness: codex+model: gpt-6-sol+codex:+ auth_refresh: falsesetup:- uses: ./.github/actions/tend-setup# Verify the toolchain installed above before the agent starts. Four toolsdiff --git a/.github/AGENTS.md b/.github/AGENTS.mdindex ef453ca04..e3b5f046d 100644--- a/.github/AGENTS.md+++ b/.github/AGENTS.md@@ -8,14 +8,16 @@ worktrunk-bot is a PAT-backed GitHub user with write access. Only the repo owner## Tokens and environments-- tend admits main and holds CLAUDE_CODE_OAUTH_TOKEN and TEND_BOT_TOKEN.+- tend admits main and holds CODEX_AUTH_JSON and TEND_BOT_TOKEN for concurrent agent jobs.- release admits tags and holds AUR_SSH_PRIVATE_KEY, TEND_BOT_TOKEN, and SIGNPATH_API_TOKEN; it also gates packslip signing and crates.io Trusted Publishing through OIDC.- github-pages admits main and uses OIDC without a stored secret.- CODECOV_TOKEN is a repo secret allowlisted for coverage upload.A job naming an environment can reference all its secrets through the secrets context; pass each secret only to the step that needs it. Signing and publishing share release because their ref gates are the same. The branch and tag policies are security gates: do not broaden them to make a workflow run. Tag environments admit every tag because the Tag operations ruleset controls creation and movement. tend and release each hold TEND_BOT_TOKEN because their admitted refs differ.-Generated tend workflows use environment {name: tend, deployment: false}. The deployment flag prevents pull_request_target runs from creating misleading deployment records on PRs. Edit the generator or its config, not generated tend-*.yaml files.+Generated tend agent workflows use environment {name: tend, deployment: false}. The deployment flag prevents pull_request_target runs from creating misleading deployment records on PRs. Edit the generator or its config, not generated tend-*.yaml files.++Codex subscription refresh is external (`codex.auth_refresh: false`). Mackup's account rotator owns the refreshable logins and publishes access-only CODEX_AUTH_JSON with the CODEX_ACCOUNT environment variable. Refresh tokens stay on the rotator's host.## Sandbox toolchaindiff --git a/.github/workflows/tend-ci-fix.yaml b/.github/workflows/tend-ci-fix.yamlindex 9d4b8fb18..09b88da46 100644--- a/.github/workflows/tend-ci-fix.yaml+++ b/.github/workflows/tend-ci-fix.yaml@@ -47,18 +47,18 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:ci-fix ${{ github.event.workflow_run.id }}+ $ci-fix ${{ github.event.workflow_run.id }}- Run URL: ${{ github.event.workflow_run.html_url }}- Commit: ${{ github.event.workflow_run.head_sha }}- Commit message: ${{ github.event.workflow_run.head_commit.message }}diff --git a/.github/workflows/tend-mention.yaml b/.github/workflows/tend-mention.yamlindex 5b62667f9..51474b331 100644--- a/.github/workflows/tend-mention.yaml+++ b/.github/workflows/tend-mention.yaml@@ -346,18 +346,18 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: mentionbase_branch: ${{ github.event.repository.default_branch }}prompt: >-- /tend-ci-runner:mention+ $mention${{ steps.delay.outputs.seconds&& format('This job started {0}s after the triggering event (over ~40s means it was queued). ',diff --git a/.github/workflows/tend-nightly.yaml b/.github/workflows/tend-nightly.yamlindex 62a45e036..24083bee1 100644--- a/.github/workflows/tend-nightly.yaml+++ b/.github/workflows/tend-nightly.yaml@@ -35,15 +35,15 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:nightly+ $nightlydiff --git a/.github/workflows/tend-notifications.yaml b/.github/workflows/tend-notifications.yamlindex ec501e2c1..3af2e6f8f 100644--- a/.github/workflows/tend-notifications.yaml+++ b/.github/workflows/tend-notifications.yaml@@ -235,19 +235,19 @@ jobs:if: steps.check.outputs.count != '0' || steps.check.outputs.conflict_count != '0' || github.event_name == 'workflow_dispatch'- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; doneif: steps.check.outputs.count != '0' || steps.check.outputs.conflict_count != '0' || github.event_name == 'workflow_dispatch'- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]if: steps.check.outputs.count != '0' || steps.check.outputs.conflict_count != '0' || github.event_name == 'workflow_dispatch'with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:notifications+ $notificationsNotification snapshot cutoff: ${{ steps.check.outputs.cutoff }}Possible conflicted bot PR count: ${{ steps.check.outputs.conflict_count }}diff --git a/.github/workflows/tend-review-runs.yaml b/.github/workflows/tend-review-runs.yamlindex a42ed1866..9f1958f28 100644--- a/.github/workflows/tend-review-runs.yaml+++ b/.github/workflows/tend-review-runs.yaml@@ -35,15 +35,15 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:review-runs+ $review-runsdiff --git a/.github/workflows/tend-review.yaml b/.github/workflows/tend-review.yamlindex 098417423..565dce98a 100644--- a/.github/workflows/tend-review.yaml+++ b/.github/workflows/tend-review.yaml@@ -53,18 +53,18 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: reviewbase_branch: ${{ github.event.pull_request.base.ref }}prompt: |2- /tend-ci-runner:review ${{ github.event.pull_request.number }}+ $review ${{ github.event.pull_request.number }}- name: Remove the eyes reactionif: always()diff --git a/.github/workflows/tend-triage.yaml b/.github/workflows/tend-triage.yamlindex ccf2bc055..afe4eebee 100644--- a/.github/workflows/tend-triage.yaml+++ b/.github/workflows/tend-triage.yaml@@ -47,18 +47,18 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:triage ${{ github.event.issue.number }}+ $triage ${{ github.event.issue.number }}- name: Remove the eyes reactionif: always()diff --git a/.github/workflows/tend-weekly.yaml b/.github/workflows/tend-weekly.yamlindex a51ccd57d..9d3b881f9 100644--- a/.github/workflows/tend-weekly.yaml+++ b/.github/workflows/tend-weekly.yaml@@ -35,15 +35,15 @@ jobs:- uses: ./.github/actions/tend-setup- run: for t in cargo-insta cargo-nextest pre-commit nu nix; do command -v "$t" >/dev/null || { echo "::error::tend setup is missing $t; see Sandbox toolchain in .github/AGENTS.md"; exit 1; }; done- - uses: max-sixty/tend/[email protected]+ - uses: max-sixty/tend/[email protected]with:github_token: ${{ secrets.TEND_BOT_TOKEN }}merge: restricted- claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}- anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}+ openai_api_key: ${{ secrets.OPENAI_API_KEY }}+ codex_auth_json: ${{ secrets.CODEX_AUTH_JSON }}bot_name: worktrunk-bot- model: opus+ model: gpt-6-solcheckout_mode: basebase_branch: ${{ github.event.repository.default_branch }}prompt: |2- /tend-ci-runner:weekly+ $weekly