2 Commits

Author	SHA1	Message	Date
Garry Tan	8444626c6a	Merge branch 'main' into garrytan/team-supabase-store ... 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>	2026-03-21 16:28:27 -07:00
Garry Tan	2769cd043d	Merge branch 'main' into garrytan/team-supabase-store ... Resolved 4 conflicts: - scripts/gen-skill-docs.ts: kept ARTIFACT_SETUP + added main's new resolvers (SPEC_REVIEW_LOOP, DESIGN_SKETCH, BENEFITS_FROM, CODEX_REVIEW_STEP). Updated codex review-log to use new paths. - ship/SKILL.md.tmpl: adopted {{CODEX_REVIEW_STEP}} macro from main - test/skill-e2e.test.ts: added main's new E2E tests (office-hours spec review, plan-ceo benefits-from) + kept our E2E isolation cleanup Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-03-21 09:29:05 -07:00