mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-01 19:25:10 +02:00
9ec4ab7eb9
* fix: ad-hoc codesign compiled binaries on Apple Silicon after build On some Apple Silicon machines, Bun's --compile produces a corrupt or linker-only code signature. macOS kills these binaries with SIGKILL (exit 137, zsh: killed) before they execute a single instruction. Add a post-build codesign step to setup that runs only on Darwin arm64: 1. Remove the corrupt/linker-only signature (required — a direct re-sign fails with 'invalid or unsupported format for signature') 2. Apply a fresh ad-hoc signature The step is idempotent, costs <1s, and is what Bun's own docs recommend for distributed standalone executables. All four compiled binaries are covered: browse, find-browse, design, and gstack-global-discover. Failure is a non-fatal warning so Intel/CI builds are unaffected. Fixes #997 * fix: prevent codex exec stdin deadlock with </dev/null redirect codex CLI 0.120.0+ blocks indefinitely when stdin is a non-TTY pipe (Claude Code Bash tool, background bash, CI). The CLI sees a non-TTY stdin and waits for EOF to append it as a <stdin> block, even when the prompt is passed as a positional argument. Fix: add < /dev/null to every codex exec and codex review invocation in the source-of-truth files (scripts/resolvers/*.ts and *.md.tmpl). Generated SKILL.md files will be produced by bun run gen:skill-docs in a subsequent commit (Tension D: template+resolver only, generator is authoritative, not cherry-picked artifacts). Affected source files (16 total invocations): - scripts/resolvers/review.ts (4) - scripts/resolvers/design.ts (3) - codex/SKILL.md.tmpl (5) - autoplan/SKILL.md.tmpl (4) Fixes #971 Co-Authored-By: loning <loning@users.noreply.github.com> Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * feat: codex/autoplan hardening + Apple Silicon coreutils auto-install Hardens /codex and /autoplan against silent failures surfaced by the #972 stdin fix and #1003 Apple Silicon codesign. Six-layer defense: 1. **Multi-signal auth probe** (new Step 0.5 / Phase 0.5): env-based auth ($CODEX_API_KEY, $OPENAI_API_KEY) OR file-based auth (${CODEX_HOME:-~/.codex}/auth.json). Rejects false negatives that the old file-only check produced for CI / platform-engineer users. 2. **Timeout wrapper** around every codex exec / codex review invocation: gtimeout → timeout → unwrapped fallback chain. On exit 124, surfaces common causes + actionable next step. Guards against model-API stalls not covered by the #972 stdin fix. 3. **Stderr capture in Challenge mode** (codex/SKILL.md.tmpl:208): 2>/dev/null → 2>$TMPERR. Post-invocation grep for auth/login/unauthorized surfaces errors that were previously dropped silently. 4. **Completeness check** in the Python JSON parser: tracks turn.completed events and warns on zero (possible mid-stream disconnect). 5. **Version warning** for known-bad Codex CLI (0.120.0-0.120.2, the range that introduced the stdin deadlock #972 fixes). Anchored regex `(^|[^0-9.])0\.120\.(0|1|2)([^0-9.]|$)` prevents 0.120.10 / 0.120.20 false positives. 6. **Failure telemetry + operational learnings**: codex_timeout, codex_auth_failed, codex_cli_missing, codex_version_warning events land in ~/.gstack/analytics/skill-usage.jsonl behind the existing telemetry opt-in. On timeout (exit 124), auto-logs an operational learning via gstack-learnings-log so future /investigate sessions surface prior hang patterns automatically. **Shared helper** (bin/gstack-codex-probe): consolidates all four pieces (auth probe, version check, timeout wrapper, telemetry logger) into one bash file that /codex and /autoplan source. Namespace-prefixed (_gstack_codex_*) with a unit test that verifies sourcing does not leak shell options into the caller. pathRewrites in host configs rewrite ~/.claude/skills/gstack → $GSTACK_ROOT for Codex, $GSTACK_BIN for Factory/Cursor/etc. **Apple Silicon coreutils auto-install** (setup:264): macOS lacks GNU timeout by default; Homebrew's coreutils installs it as gtimeout to avoid shadowing BSD utilities. ./setup now auto-installs coreutils on Darwin (arch-agnostic — applies to Intel + Apple Silicon) when neither gtimeout nor timeout is present. Opt-out via GSTACK_SKIP_COREUTILS=1 for CI, managed machines, or offline envs. **25 deterministic unit tests** (test/codex-hardening.test.ts): - 8 auth probe combinations (env precedence, whitespace, alternate $CODEX_HOME, corrupt file paths) - 10 version regex cases including 0.120.10 false-positive guards and v-prefixed / multiline output - 4 timeout wrapper + namespace hygiene (bash -n, gtimeout preference, set-option leak check) - 3 telemetry payload schema checks (confirms env values + auth tokens never leak into emitted events) **1 periodic-tier E2E** (test/skill-e2e-autoplan-dual-voice.test.ts): gates the /autoplan dual-voice path — asserts both Claude subagent and Codex voices produce output in Phase 1, OR that [codex-unavailable] is logged when Codex is absent. ~\$1/run, not a CI gate. Golden baseline + gen-skill-docs exclusion list updated for the new codex path references and the 16 < /dev/null redirects from #972. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix: plan-review right-sized diff counterbalance (not minimal-diff default) /plan-ceo-review and /plan-eng-review listed "minimal diff" as an engineering preference without counterbalancing language. Reviewers picked up on that and rejected rewrites that should have been approved. The preference is now framed as "right-sized diff" with explicit permission to recommend a rewrite when the existing foundation is broken. Implementation alternatives section in CEO review gets an equal-weight clarification: don't default to minimal viable just because it is smaller. Recommend whichever best serves the user's goal; if the right answer is a rewrite, say so. Three-line tone edit per template, no voice / ETHOS / YC / promotional content change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * release: v0.18.4.0 — codex + Apple Silicon hardening wave - Apple Silicon codesign fix (#1003 @voidborne-d) - Codex stdin deadlock fix (#972 @loning) - Codex timeout wrapper (gtimeout → timeout → unwrapped fallback) - Multi-signal auth gate for /codex + /autoplan - Codex version warning for known-bad CLI (0.120.0-0.120.2) - Challenge mode stderr capture + completeness check - Plan-review right-sized diff counterbalance - Failure telemetry + auto-log timeout as operational learning - 25 deterministic unit tests + dual-voice periodic E2E Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: voidborne-d <voidborne-d@users.noreply.github.com> Co-authored-by: loning <loning@users.noreply.github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
78 lines
3.5 KiB
TypeScript
78 lines
3.5 KiB
TypeScript
import { describe, test, expect } from 'bun:test';
|
|
import { spawnSync } from 'child_process';
|
|
import * as path from 'path';
|
|
import * as fs from 'fs';
|
|
import * as os from 'os';
|
|
|
|
const ROOT = path.resolve(import.meta.dir, '..');
|
|
const SETUP_SCRIPT = path.join(ROOT, 'setup');
|
|
|
|
describe('setup: Apple Silicon codesign', () => {
|
|
test('setup script contains codesign block for Darwin arm64', () => {
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
// Verify the codesign guard checks both Darwin and arm64
|
|
expect(content).toContain('$(uname -s)" = "Darwin"');
|
|
expect(content).toContain('$(uname -m)" = "arm64"');
|
|
// Verify remove-then-resign two-step pattern
|
|
expect(content).toContain('codesign --remove-signature');
|
|
expect(content).toContain('codesign -s - -f');
|
|
});
|
|
|
|
test('codesign block covers all compiled binaries', () => {
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
// Extract the binaries from the codesign for-loop
|
|
const forMatch = content.match(/for _bin in ([^;]+);/);
|
|
expect(forMatch).toBeTruthy();
|
|
const binaries = forMatch![1].trim().split(/\s+/);
|
|
// All four compiled binaries from `bun run build` must be covered
|
|
expect(binaries).toContain('browse/dist/browse');
|
|
expect(binaries).toContain('browse/dist/find-browse');
|
|
expect(binaries).toContain('design/dist/design');
|
|
expect(binaries).toContain('bin/gstack-global-discover');
|
|
});
|
|
|
|
test('codesign block is inside the NEEDS_BUILD=1 branch', () => {
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
// The codesign block should appear after `bun run build` and before the
|
|
// `if [ ! -x "$BROWSE_BIN" ]` guard that checks the build succeeded.
|
|
const buildIdx = content.indexOf('bun run build');
|
|
const codesignIdx = content.indexOf('codesign --remove-signature');
|
|
const browseCheckIdx = content.indexOf('gstack setup failed: browse binary missing');
|
|
expect(buildIdx).toBeGreaterThan(-1);
|
|
expect(codesignIdx).toBeGreaterThan(buildIdx);
|
|
expect(browseCheckIdx).toBeGreaterThan(codesignIdx);
|
|
});
|
|
|
|
test('codesign block is idempotent (skips missing binaries)', () => {
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
// The loop must guard with a file-existence + executable check before codesigning
|
|
expect(content).toContain('[ -f "$_bin_path" ] && [ -x "$_bin_path" ] || continue');
|
|
});
|
|
|
|
test('codesign failure is a warning, not a fatal error', () => {
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
// On codesign failure, log a warning but don't exit
|
|
expect(content).toContain('warning: codesign failed for');
|
|
// Should NOT have `set -e` causing exit on codesign failure
|
|
// (the `|| true` after --remove-signature and the if-guard around -s - -f handle this)
|
|
expect(content).toContain('codesign --remove-signature "$_bin_path" 2>/dev/null || true');
|
|
});
|
|
|
|
test('codesign shell snippet is syntactically valid', () => {
|
|
// Extract the codesign block and validate it parses as bash
|
|
const content = fs.readFileSync(SETUP_SCRIPT, 'utf-8');
|
|
const match = content.match(
|
|
/# macOS Apple Silicon: ad-hoc codesign[\s\S]*?done\n\s*fi/
|
|
);
|
|
expect(match).toBeTruthy();
|
|
const snippet = match![0];
|
|
// Wrap in a function to make it a complete script, then syntax-check
|
|
const testScript = `#!/usr/bin/env bash\nset -e\n_test_fn() {\n${snippet}\n}\n`;
|
|
const result = spawnSync('bash', ['-n', '-c', testScript], {
|
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
timeout: 5000,
|
|
});
|
|
expect(result.status).toBe(0);
|
|
});
|
|
});
|