RomanNum3ral
/
gstack
mirror of https://github.com/garrytan/gstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(setup): host-scope Codex regen and plan-tune hooks 

--host grok-build no longer regenerates .agents/ Codex skill docs or
prompts to install Claude Code plan-tune hooks into ~/.claude/settings.json.
Codex .agents/ gen runs only when INSTALL_CODEX=1; plan-tune hooks only when
INSTALL_CLAUDE=1 (or explicit --plan-tune-hooks).
This commit is contained in:
Nehr 2026-07-13 01:26:12 +07:00
parent 13d2f7dcdf
commit 9f8929f414
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
setup
View File

@ -447,16 +447,13 @@ if [ ! -x "$BROWSE_BIN" ]; then
exit 1
fi
# 1b. Generate .agents/ Codex skill docs — always regenerate to prevent stale descriptions.
# 1b. Generate .agents/ Codex skill docs — only when installing for Codex.
# .agents/ is no longer committed — generated at setup time from .tmpl templates.
# bun run build already does this, but we need it when NEEDS_BUILD=0 (binary is fresh).
# Always regenerate: generation is fast (<2s) and mtime-based staleness checks are fragile
# (miss stale files when timestamps match after clone/checkout/upgrade).
AGENTS_DIR="$SOURCE_GSTACK_DIR/.agents/skills"
NEEDS_AGENTS_GEN=1
if [ "$NEEDS_AGENTS_GEN" -eq 1 ] && [ "$NEEDS_BUILD" -eq 0 ]; then
log "Generating .agents/ skill docs..."
# Host-scoped: --host grok-build / claude / factory / etc. must not pay Codex regen cost
# or imply a Codex install is in progress.
if [ "$INSTALL_CODEX" -eq 1 ] && [ "$NEEDS_BUILD" -eq 0 ]; then
log "Generating .agents/ skill docs for Codex..."
(
cd "$SOURCE_GSTACK_DIR"
bun_cmd install --frozen-lockfile 2>/dev/null || bun_cmd install
@ -1573,6 +1570,10 @@ fi
# something at runtime instead of being agent-convention. Explicit consent UX
# per D4 + Codex: never mutate settings.json silently.
#
# Host-scoped: these hooks only affect Claude Code. Skip the prompt entirely for
# non-Claude host installs (e.g. --host grok-build) unless the user explicitly
# passed --plan-tune-hooks. Grok /plan-tune still works via skill-text path.
#
# Idempotent via _gstack_source tag = 'plan-tune-cathedral'. If both hooks
# already registered under that tag, the install is a no-op (no prompt).
PLAN_TUNE_LOG_HOOK="$SOURCE_GSTACK_DIR/hosts/claude/hooks/question-log-hook"
@ -1580,7 +1581,14 @@ PLAN_TUNE_PREF_HOOK="$SOURCE_GSTACK_DIR/hosts/claude/hooks/question-preference-h
AUQ_ERROR_FALLBACK_HOOK="$SOURCE_GSTACK_DIR/hosts/claude/hooks/auq-error-fallback-hook"
PLAN_TUNE_INSTALL_MARKER="$HOME/.gstack/.plan-tune-hooks-prompted"
# Explicit --plan-tune-hooks still allowed from any host install (user intent).
_PT_EXPLICIT_YES=0
case "$(printf '%s' "${PLAN_TUNE_HOOKS_MODE:-}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')" in
y|yes|true|install|on|1) _PT_EXPLICIT_YES=1 ;;
esac
if [ "$NO_TEAM_MODE" -ne 1 ] \
&& { [ "$INSTALL_CLAUDE" -eq 1 ] || [ "$_PT_EXPLICIT_YES" -eq 1 ]; } \
&& [ -x "$SETTINGS_HOOK" ] \
&& [ -x "$PLAN_TUNE_LOG_HOOK" ] \
&& [ -x "$PLAN_TUNE_PREF_HOOK" ]; then

10
test/setup-plan-tune-hooks-noninteractive.test.ts
View File

@ -60,6 +60,16 @@ describe('setup: plan-tune hooks are non-interactive-safe', () => {
expect(setupSrc).toMatch(/tr '\[:upper:\]' '\[:lower:\]'/);
expect(setupSrc).toMatch(/PT_DECISION=\$\(printf .* tr/);
});
test('plan-tune hooks are Claude-host-scoped (skip for --host grok-build)', () => {
// Non-Claude host installs must not prompt to mutate ~/.claude/settings.json.
// Explicit --plan-tune-hooks still allowed via _PT_EXPLICIT_YES.
expect(setupSrc).toContain('_PT_EXPLICIT_YES');
expect(setupSrc).toContain('[ "$INSTALL_CLAUDE" -eq 1 ] || [ "$_PT_EXPLICIT_YES" -eq 1 ]');
// Codex .agents/ regen is also host-scoped — not always-on during grok-only setup.
expect(setupSrc).toContain('[ "$INSTALL_CODEX" -eq 1 ] && [ "$NEEDS_BUILD" -eq 0 ]');
expect(setupSrc).toContain('Generating .agents/ skill docs for Codex...');
});
});
describe('dev-setup: never silently mutates global settings.json', () => {