mirror of
https://github.com/garrytan/gstack.git
synced 2026-07-07 08:37:52 +02:00
merge: integrate origin/main (v0.18.4.0) — codex + Apple Silicon hardening
Resolves conflicts in VERSION (kept 0.19.0.0), package.json (kept 0.19.0.0), and CHANGELOG.md (preserved 0.19.0.0 at top, inserted 0.18.4.0 below). Main brought v0.18.4.0's codex + Apple Silicon hardening wave (PR #1056): - Apple Silicon ad-hoc codesigning in ./setup (fixes SIGKILL on first run) - /codex stdin deadlock fix (redirect from /dev/null) - /codex + /autoplan preflight auth + version checks - 10-minute timeout wrapper via gtimeout/timeout - New bin/gstack-codex-probe consolidates auth/version/timeout logic - test/codex-hardening.test.ts (25 unit tests, gate tier) - test/setup-codesign.test.ts - test/skill-e2e-autoplan-dual-voice.test.ts (periodic tier) Auto-merged SKILL.md.tmpl updates across autoplan, codex, plan-ceo-review, plan-eng-review, and the scripts/resolvers/{design,review}.ts modules. None conflicted with v0.19's preamble refactor or new benchmark-models skill — clean 3-way merge. Regenerated all SKILL.md files. Ship golden fixtures refreshed for claude/codex/factory hosts. 423 tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Garry Tan
+69
-12
@@ -932,6 +932,39 @@ Loaded review skills from disk. Starting full review pipeline with auto-decision
|
||||
|
||||
---
|
||||
|
||||
## Phase 0.5: Codex auth + version preflight
|
||||
|
||||
Before invoking any Codex voice, preflight the CLI: verify auth (multi-signal) and
|
||||
warn on known-bad CLI versions. This is infrastructure for all 4 phases below —
|
||||
source it once here and the helper functions stay in scope for the rest of the
|
||||
workflow.
|
||||
|
||||
```bash
|
||||
_TEL=$(~/.claude/skills/gstack/bin/gstack-config get telemetry 2>/dev/null || echo off)
|
||||
source ~/.claude/skills/gstack/bin/gstack-codex-probe
|
||||
|
||||
# Check Codex binary. If missing, tag the degradation matrix and continue
|
||||
# with Claude subagent only (autoplan's existing degradation fallback).
|
||||
if ! command -v codex >/dev/null 2>&1; then
|
||||
_gstack_codex_log_event "codex_cli_missing"
|
||||
echo "[codex-unavailable: binary not found] — proceeding with Claude subagent only"
|
||||
_CODEX_AVAILABLE=false
|
||||
elif ! _gstack_codex_auth_probe >/dev/null; then
|
||||
_gstack_codex_log_event "codex_auth_failed"
|
||||
echo "[codex-unavailable: auth missing] — proceeding with Claude subagent only. Run \`codex login\` or set \$CODEX_API_KEY to enable dual-voice review."
|
||||
_CODEX_AVAILABLE=false
|
||||
else
|
||||
_gstack_codex_version_check # non-blocking warn if known-bad
|
||||
_CODEX_AVAILABLE=true
|
||||
fi
|
||||
```
|
||||
|
||||
If `_CODEX_AVAILABLE=false`, all Phase 1-3.5 Codex voices below degrade to
|
||||
`[codex-unavailable]` in the degradation matrix. /autoplan completes with
|
||||
Claude subagent only — saves token spend on Codex prompts we can't use.
|
||||
|
||||
---
|
||||
|
||||
## Phase 1: CEO Review (Strategy & Scope)
|
||||
|
||||
Follow plan-ceo-review/SKILL.md — all sections, full depth.
|
||||
@@ -955,7 +988,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex CEO voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
You are a CEO/founder advisor reviewing a development plan.
|
||||
Challenge the strategic foundations: Are the premises valid or assumed? Is this the
|
||||
@@ -963,9 +996,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
What alternatives were dismissed too quickly? What competitive or market risks are
|
||||
unaddressed? What scope decisions will look foolish in 6 months? Be adversarial.
|
||||
No compliments. Just the strategic blind spots.
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude CEO subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent CEO/strategist
|
||||
@@ -1066,7 +1105,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex design voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Read the plan file at <plan_path>. Evaluate this plan's
|
||||
UI/UX design decisions.
|
||||
@@ -1080,9 +1119,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
accessibility requirements (keyboard nav, contrast, touch targets) specified or
|
||||
aspirational? Does the plan describe specific UI decisions or generic patterns?
|
||||
What design decisions will haunt the implementer if left ambiguous?
|
||||
Be opinionated. No hedging." -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
Be opinionated. No hedging." -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude design subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent senior product designer
|
||||
@@ -1141,7 +1186,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex eng voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Review this plan for architectural issues, missing edge cases,
|
||||
and hidden complexity. Be adversarial.
|
||||
@@ -1150,9 +1195,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
CEO: <insert CEO consensus table summary — key concerns, DISAGREEs>
|
||||
Design: <insert Design consensus table summary, or 'skipped, no UI scope'>
|
||||
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude eng subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent senior engineer
|
||||
@@ -1256,7 +1307,7 @@ Log: "Phase 3.5 skipped — no developer-facing scope detected."
|
||||
**Codex DX voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Read the plan file at <plan_path>. Evaluate this plan's developer experience.
|
||||
|
||||
@@ -1270,9 +1321,15 @@ Log: "Phase 3.5 skipped — no developer-facing scope detected."
|
||||
3. API/CLI design: are names guessable? Are defaults sensible? Is it consistent?
|
||||
4. Docs: can a dev find what they need in under 2 minutes? Are examples copy-paste-complete?
|
||||
5. Upgrade path: can devs upgrade without fear? Migration guides? Deprecation warnings?
|
||||
Be adversarial. Think like a developer who is evaluating this against 3 competitors." -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
Be adversarial. Think like a developer who is evaluating this against 3 competitors." -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude DX subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent DX engineer
|
||||
|
||||
+69
-12
@@ -234,6 +234,39 @@ Loaded review skills from disk. Starting full review pipeline with auto-decision
|
||||
|
||||
---
|
||||
|
||||
## Phase 0.5: Codex auth + version preflight
|
||||
|
||||
Before invoking any Codex voice, preflight the CLI: verify auth (multi-signal) and
|
||||
warn on known-bad CLI versions. This is infrastructure for all 4 phases below —
|
||||
source it once here and the helper functions stay in scope for the rest of the
|
||||
workflow.
|
||||
|
||||
```bash
|
||||
_TEL=$(~/.claude/skills/gstack/bin/gstack-config get telemetry 2>/dev/null || echo off)
|
||||
source ~/.claude/skills/gstack/bin/gstack-codex-probe
|
||||
|
||||
# Check Codex binary. If missing, tag the degradation matrix and continue
|
||||
# with Claude subagent only (autoplan's existing degradation fallback).
|
||||
if ! command -v codex >/dev/null 2>&1; then
|
||||
_gstack_codex_log_event "codex_cli_missing"
|
||||
echo "[codex-unavailable: binary not found] — proceeding with Claude subagent only"
|
||||
_CODEX_AVAILABLE=false
|
||||
elif ! _gstack_codex_auth_probe >/dev/null; then
|
||||
_gstack_codex_log_event "codex_auth_failed"
|
||||
echo "[codex-unavailable: auth missing] — proceeding with Claude subagent only. Run \`codex login\` or set \$CODEX_API_KEY to enable dual-voice review."
|
||||
_CODEX_AVAILABLE=false
|
||||
else
|
||||
_gstack_codex_version_check # non-blocking warn if known-bad
|
||||
_CODEX_AVAILABLE=true
|
||||
fi
|
||||
```
|
||||
|
||||
If `_CODEX_AVAILABLE=false`, all Phase 1-3.5 Codex voices below degrade to
|
||||
`[codex-unavailable]` in the degradation matrix. /autoplan completes with
|
||||
Claude subagent only — saves token spend on Codex prompts we can't use.
|
||||
|
||||
---
|
||||
|
||||
## Phase 1: CEO Review (Strategy & Scope)
|
||||
|
||||
Follow plan-ceo-review/SKILL.md — all sections, full depth.
|
||||
@@ -257,7 +290,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex CEO voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
You are a CEO/founder advisor reviewing a development plan.
|
||||
Challenge the strategic foundations: Are the premises valid or assumed? Is this the
|
||||
@@ -265,9 +298,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
What alternatives were dismissed too quickly? What competitive or market risks are
|
||||
unaddressed? What scope decisions will look foolish in 6 months? Be adversarial.
|
||||
No compliments. Just the strategic blind spots.
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude CEO subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent CEO/strategist
|
||||
@@ -368,7 +407,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex design voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Read the plan file at <plan_path>. Evaluate this plan's
|
||||
UI/UX design decisions.
|
||||
@@ -382,9 +421,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
accessibility requirements (keyboard nav, contrast, touch targets) specified or
|
||||
aspirational? Does the plan describe specific UI decisions or generic patterns?
|
||||
What design decisions will haunt the implementer if left ambiguous?
|
||||
Be opinionated. No hedging." -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
Be opinionated. No hedging." -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude design subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent senior product designer
|
||||
@@ -443,7 +488,7 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
**Codex eng voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Review this plan for architectural issues, missing edge cases,
|
||||
and hidden complexity. Be adversarial.
|
||||
@@ -452,9 +497,15 @@ Override: every AskUserQuestion → auto-decide using the 6 principles.
|
||||
CEO: <insert CEO consensus table summary — key concerns, DISAGREEs>
|
||||
Design: <insert Design consensus table summary, or 'skipped, no UI scope'>
|
||||
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
File: <plan_path>" -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude eng subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent senior engineer
|
||||
@@ -558,7 +609,7 @@ Log: "Phase 3.5 skipped — no developer-facing scope detected."
|
||||
**Codex DX voice** (via Bash):
|
||||
```bash
|
||||
_REPO_ROOT=$(git rev-parse --show-toplevel) || { echo "ERROR: not in a git repo" >&2; exit 1; }
|
||||
codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
_gstack_codex_timeout_wrapper 600 codex exec "IMPORTANT: Do NOT read or execute any SKILL.md files or files in skill definition directories (paths containing skills/gstack). These are AI assistant skill definitions meant for a different system. Stay focused on repository code only.
|
||||
|
||||
Read the plan file at <plan_path>. Evaluate this plan's developer experience.
|
||||
|
||||
@@ -572,9 +623,15 @@ Log: "Phase 3.5 skipped — no developer-facing scope detected."
|
||||
3. API/CLI design: are names guessable? Are defaults sensible? Is it consistent?
|
||||
4. Docs: can a dev find what they need in under 2 minutes? Are examples copy-paste-complete?
|
||||
5. Upgrade path: can devs upgrade without fear? Migration guides? Deprecation warnings?
|
||||
Be adversarial. Think like a developer who is evaluating this against 3 competitors." -C "$_REPO_ROOT" -s read-only --enable web_search_cached
|
||||
Be adversarial. Think like a developer who is evaluating this against 3 competitors." -C "$_REPO_ROOT" -s read-only --enable web_search_cached < /dev/null
|
||||
_CODEX_EXIT=$?
|
||||
if [ "$_CODEX_EXIT" = "124" ]; then
|
||||
_gstack_codex_log_event "codex_timeout" "600"
|
||||
_gstack_codex_log_hang "autoplan" "0"
|
||||
echo "[codex stalled past 10 minutes — tagging as [codex-unavailable] for this phase and proceeding with Claude subagent only]"
|
||||
fi
|
||||
```
|
||||
Timeout: 10 minutes
|
||||
Timeout: 10 minutes (shell-wrapper) + 12 minutes (Bash outer gate). On hang, auto-degrades this phase's Codex voice.
|
||||
|
||||
**Claude DX subagent** (via Agent tool):
|
||||
"Read the plan file at <plan_path>. You are an independent DX engineer
|
||||
|
||||
Reference in New Issue
Block a user