feat(b-0857.2-wire): route install.sh suggested-host through zeta-hardware-detect.ts (GPU+storage+CPU detection with lspci fallback)#5646
Merged
AceHack merged 1 commit intoMay 27, 2026
Conversation
…dware-detect.ts (extends GPU-only inline lspci → GPU+storage+CPU classification with fallback) PR #5642 shipped the TS module + 24 unit tests for hardware classification (GPU + storage shape + CPU vendor + memory + suggested host). This commit wires the install.sh menu to call it for suggested-host, replacing the inline lspci-only heuristic. The TS module's logic is strictly richer than the inline replacement: | Heuristic | Old (inline lspci) | New (TS module) | |------------------------|---------------------------|----------------------------------------| | GPU detected | → worker-gpu | → worker-gpu | | ≥4 disks + ≥64GB RAM | not detected | → worker-template (storage-heavy) | | ≥16 cores + ≥32GB RAM | not detected | → worker-template (CPU-heavy) | | Default | → control-plane | → control-plane | Composition path: 1. SCRIPT_DIR resolves the script's own directory 2. HWDETECT_REPO_ROOT = $SCRIPT_DIR/../.. (two-dirs-up from full-ai-cluster/usb-nixos-installer/ → repo root) 3. HWDETECT_TS = $HWDETECT_REPO_ROOT/tools/installer/zeta-hardware-detect.ts 4. If `bun` on PATH AND TS file exists → run `bun ... --suggested-host` 5. If unavailable OR returns empty → fall back to original inline lspci-only heuristic (degraded but functional) 6. Menu text + default-choice logic unchanged; only the SUGGESTED_HOST computation source differs The fallback ensures the menu still works in degraded environments (no bun on PATH, missing TS file, TS module crash) — operator can still pick a host attribute via the numbered menu. Substrate-honest disclosure: the fallback's GPU-only heuristic IS less precise than the TS module's GPU+storage+CPU classification, so falling back loses the storage-heavy and CPU-heavy detection — but doesn't break flow. Menu output now distinguishes the three suggestion classes: - worker-gpu → "GPU detected — likely worker node" - worker-template → "storage-heavy OR CPU-heavy node — customize per PROVISIONING.md cookie-cutter workflow" - control-plane → "no GPU + not storage/CPU-heavy — defaulting to control-plane" Validation: - bash -n syntax check passed - Docker harness (bun tools/ci/docker-nixos-install-sh-test.ts) passed in 15s Composes with: - #5642 (TS module + tests landing) - #5635 (cluster-type menu extension that established the numbered-menu structure this commit upgrades) - B-0857.3 (next: factor zeta-install.sh body into callable nixos-install-from-usb.sh) Closes operator's "getting the menu fixed so it has all the cluster types we talked about — storage cpu gpu etc... and letting you select multiple or detecting based on hardware etc..." at the detection-based-on-hardware scope. Multi-select-cluster-types remains a future B-0792-extension (requires flake-shape refactor to support role-tagging per node). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
There was a problem hiding this comment.
Pull request overview
Wires the existing inline GPU-only lspci heuristic in zeta-install.sh to invoke the TS module tools/installer/zeta-hardware-detect.ts (from #5642), broadening the suggested-host classification to also recognize storage-heavy and CPU-heavy nodes, with a graceful fallback to the original inline heuristic when bun or the TS file is unreachable.
Changes:
- Resolve
SCRIPT_DIRandHWDETECT_REPO_ROOT(two dirs up) and invokebun .../zeta-hardware-detect.ts --suggested-hostwhen available, capturing the single-line attribute. - Preserve the original inline lspci heuristic as a degraded fallback path, tagged in a separate
SUGGESTED_REASONstring. - Replace the if/else GPU-only display block with a
casecoveringworker-gpu,worker-template, and defaultcontrol-planemessaging.
2 tasks
AceHack
pushed a commit
that referenced
this pull request
May 27, 2026
…D018 fix (Copilot 6 threads on #5648) Comprehensive accuracy rewrite addressing all 6 Copilot findings: 1. "no more re-entering" overclaim — passphraseMode=interactive DOES prompt every boot via systemd-ask-password. Reframed accurately: N per-tool login flows → ONE cred-blob passphrase. The improvement is atomicity, not zero typing. 2. Install log lines mismatch — restored to match actual zeta-install.sh output (Step 6.56 + Step 6.95-picker actual strings). 3. /boot path correctness — preserved (#5644 already fixed producer/consumer alignment to /mnt/boot ↔ /boot). 4. Manifest coverage — included gemini + codex paths (~/.gemini/oauth_creds.json, ~/.codex/auth.json) plus the full default-manifest table. 5. Second-reboot expectation — corrected: interactive mode prompts every boot by design. Operator who wants no-prompt-at-boot can switch to passphraseMode="file" (with security tradeoff named). 6. Filename reference — zeta-creds-cli.ts → zeta-creds-manifest.ts (actual canonical location of defaultManifest). Also fixes MD018 lint failure: line "#5639 + #5640 + #5643 + #5644 +" was being parsed as an ATX heading because # was at column 1. Replaced the line-wrapped PR-number prose with the default-manifest table (more useful + no MD018 trigger). Composes with: - B-0852 cred-persistence cascade (PRs that ACTUALLY ship: #5635, #5637, #5639, #5640, #5641, #5642, #5644, #5645, #5646, #5648, #5649, #5650; #5638 + #5643 were superseded → closed without merge) - common.nix passphraseMode=interactive default (PR #5640) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
AceHack
added a commit
that referenced
this pull request
May 27, 2026
…o-end verification checklist for operator) (#5648) * docs(provisioning): add cred-restore smoke-test section — first-boot + post-reboot + second-reboot verification + troubleshooting table (B-0852 end-to-end) The B-0852 cred-persistence cascade (PRs #5635 + #5637 + #5638 + #5639 + #5640 + #5643 + #5644 + #5646) closes the operator's 'don't re-enter creds over and over' pain point. This docs addition gives operators a concrete checklist to verify the full path works after a fresh USB install: - First-boot verification: what install log lines to look for - Post-reboot verification: systemctl + ls + auth-status commands - Second-reboot verification: confirm no re-entry needed - Troubleshooting table: 4 common symptoms with likely causes Closes the gap between 'cascade is shipped' and 'operator can confirm cascade works on their hardware'. The operator no longer has to figure out which systemd unit to query or which paths to check — the checklist names them. Composes with: - PROVISIONING.md (existing operator-facing install doc) - B-0852 cred-persistence substrate - The audit-extension PR (separate; catches drift at CI time) Substrate-honest scope: this is operator docs, not a TS tool. A follow-on TS smoke-test runner (run on the installed system to auto-verify the checklist) is a candidate for follow-up work but out of scope for this commit. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * fixup(docs): rewrite cred-restore smoke-test section for accuracy + MD018 fix (Copilot 6 threads on #5648) Comprehensive accuracy rewrite addressing all 6 Copilot findings: 1. "no more re-entering" overclaim — passphraseMode=interactive DOES prompt every boot via systemd-ask-password. Reframed accurately: N per-tool login flows → ONE cred-blob passphrase. The improvement is atomicity, not zero typing. 2. Install log lines mismatch — restored to match actual zeta-install.sh output (Step 6.56 + Step 6.95-picker actual strings). 3. /boot path correctness — preserved (#5644 already fixed producer/consumer alignment to /mnt/boot ↔ /boot). 4. Manifest coverage — included gemini + codex paths (~/.gemini/oauth_creds.json, ~/.codex/auth.json) plus the full default-manifest table. 5. Second-reboot expectation — corrected: interactive mode prompts every boot by design. Operator who wants no-prompt-at-boot can switch to passphraseMode="file" (with security tradeoff named). 6. Filename reference — zeta-creds-cli.ts → zeta-creds-manifest.ts (actual canonical location of defaultManifest). Also fixes MD018 lint failure: line "#5639 + #5640 + #5643 + #5644 +" was being parsed as an ATX heading because # was at column 1. Replaced the line-wrapped PR-number prose with the default-manifest table (more useful + no MD018 trigger). Composes with: - B-0852 cred-persistence cascade (PRs that ACTUALLY ship: #5635, #5637, #5639, #5640, #5641, #5642, #5644, #5645, #5646, #5648, #5649, #5650; #5638 + #5643 were superseded → closed without merge) - common.nix passphraseMode=interactive default (PR #5640) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Lior <lior@zeta.dev> Co-authored-by: Claude <noreply@anthropic.com>
AceHack
added a commit
that referenced
this pull request
May 27, 2026
…re the just-written blob at install time (operator catches bad blob BEFORE reboot, not at first boot) (#5655) Adds opt-in --verify flag to zeta-creds-picker.ts. When set, after zeta-creds-persist succeeds, the picker spawns zeta-creds-restore.ts with --dry-run + the same passphrase source + a tmpdir as --target-root. If restore-dry-run exits 0, the blob is confirmed cryptographically valid + manifest-parseable. If non-zero, the operator sees an actionable error at install time + can re-run the picker to retry. Operator-experience improvement: without --verify, a corrupt blob (wrong passphrase captured, disk write error, persist bug) only surfaces at first reboot when zeta-creds-restore.service fails its ConditionPathExists or scrypt-decrypt step. At that point the operator must reboot back into the live USB + re-run the install. With --verify, the same failure surfaces SECONDS after persist, inside the running install flow, with the live USB still mounted. New exit code 5 for verify-failed (distinct from persist-failed=4). API addition: - PickerArgs gains `verify: boolean` (default false; opt-in) - New export buildVerifyArgs(parsed, tmpTargetRoot) — pure composer of the restore-CLI argv list; testable in isolation Tests added (3 new + 2 parseArgs-extension): - --verify flag default false - --verify flag parsed when passed - buildVerifyArgs composes restore-CLI args with --dry-run + tmpdir - buildVerifyArgs propagates --passphrase-file when picker used file - buildVerifyArgs propagates --persona when set 21 pass / 0 fail (was 16; +5). Substrate-honest scope: opt-in only. Future PR can flip default-on after operator empirical testing confirms verify doesn't introduce new failure modes (e.g., tmpdir permission, restore-CLI changes). zeta-install.sh Step 6.95-picker currently does NOT pass --verify; that flip can land in a follow-up after operator tests. Composes with: - B-0852 cred-persistence cascade (#5635 + #5637 + #5639 + #5640 + #5642 + #5644 + #5645 + #5646 + #5648 + #5649 + #5650) - tools/installer/zeta-creds-restore.ts (existing --dry-run mode) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Lior <lior@zeta.dev> Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Wires the install.sh menu to use the TS hardware-detect module shipped by #5642. Replaces the GPU-only inline lspci heuristic with the TS module's richer GPU+storage+CPU classification, plus a graceful fallback if bun or the TS file isn't reachable.
What gets detected now
Composition path
Test plan
Closes
Closes operator's "getting the menu fixed so it has all the cluster types we talked about — storage cpu gpu etc... and letting you select multiple or detecting based on hardware" at the detection-based-on-hardware scope. Multi-select-cluster-types remains a future B-0792-extension (requires flake-shape refactor for per-node role-tagging).
🤖 Generated with Claude Code