Brings in 55 commits from main (v0.12.x–v0.13.5.0): Factory Droid compat,
prompt injection defense, user sovereignty, security audit, design binary,
skill namespacing, modular resolvers, Chrome sidebar, and more.
Conflict resolution:
- .agents/ SKILL.md files: deleted (main moved to .factory/)
- 8 .tmpl templates: accepted main (new features: CDP mode, design tools,
global retro, parallelization, distribution checks, plan audits)
- scripts/gen-skill-docs.ts: accepted main's modular resolver refactor
- test/helpers/session-runner.ts: accepted main + layered back CostEntry
tracking from team branch
- Generated SKILL.md files: regenerated via bun run gen:skill-docs
- Updated tests to match main's gstack-slug output (2 lines, no PROJECTS_DIR)
and review log mechanism (gstack-review-log, not $BRANCH.jsonl)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Resolved 15 conflicts:
- session-runner.ts: kept both costs array (ours) and model/timing
telemetry (main), renamed loop var to avoid shadowing model param
- skill-e2e.test.ts: accepted deletion (main split into separate files)
- gen-skill-docs.ts: kept our codex review flow with $PROJECTS_DIR paths
- plan review templates: took main + re-applied $PROJECTS_DIR paths,
replaced gstack-review-log with inline approach
- TODOS.md: took main's shipped status for E2E model pinning
- Generated SKILL.md + .agents/ files: regenerated from resolved templates
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Regenerate all SKILL.md from updated templates
- Update skill-validation tests for new gstack-slug output (3 vars)
and new path patterns (plans/ceo, gstack-slug over REMOTE_SLUG)
- Update gen-skill-docs tests for new review path ($BRANCH.jsonl)
- Mark setup-gstack-upload + gstack-upload helper as superseded
in TODOS.md (replaced by Supabase Storage)
- Fix last REMOTE_SLUG reference in greptile-triage.md
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Garry Tan