Commit bed8564
Merge origin/main into feat/agent-skills-runtime
Resolved 11 conflict regions across 7 files:
- nightly.yml: kept origin/main (weekly + on-change schedule from PR #3)
- All others (Dockerfile, nsjail-base.cfg, programmatic.py, executor.py,
nsjail.py, pool.py): kept HEAD (agent skills runtime customizations
for LibreOffice, /opt/skills mount, SKILLS_ROOT env, language-aware
/proc unmask + seccomp policy)
Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>2 files changed
Lines changed: 14 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
6 | 10 | | |
7 | 11 | | |
8 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
0 commit comments