fable output

.gitattributes

@@ -1,24 +0,0 @@
-# Force LF line endings for all text files.
-# Prevents git from auto-converting LF -> CRLF on Windows checkouts.
-* text=auto eol=lf
-
-# Explicit binary files — git won't touch line endings for these
-*.phar binary
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.zip binary
-*.gz binary
-*.tgz binary
-*.txz binary
-*.xz binary
-*.bz2 binary
-*.7z binary
-*.exe binary
-*.dll binary
-*.sfx binary
-*.so binary
-*.a binary
-*.o binary

.github/copilot-instructions.md

@@ -1,23 +0,0 @@
-# StaticPHP v3 Copilot Instructions
-
-> The canonical agent instructions live in [AGENTS.md](./AGENTS.md). This file provides the essential summary for GitHub Copilot; read `AGENTS.md` for the complete project map, working rules, and validation steps.
-
-StaticPHP is a PHP CLI application for building static PHP binaries, PHP SAPIs, extensions, libraries, and helper tools. Prefer the v3 architecture under `src/StaticPHP`, `src/Package`, `config/pkg`, and `config/artifact`.
-
-## Skills
-
-Use the repository skills when the task matches them:
-
-- `.github/skills/staticphp-package-maintenance`: add, modify, review, or validate package, artifact, extension, library, target, or tool definitions.
-- `.github/skills/staticphp-build-troubleshooting`: diagnose build, download, doctor, shell, terminal, CI, smoke-test, or log failures.
-
-## Quick Reference
-
-- **Entrypoint**: `php bin/spc`
-- **Config lint**: `php bin/spc dev:lint-config`
-- **CS fix**: `composer cs-fix`
-- **Tests**: `composer test`
-- **Static analysis**: `composer analyse`
-- **Extension packages**: `config/pkg/ext/ext-*.yml`, prefix with `ext-` in dependencies
-- **Platform suffixes**: `@unix`, `@linux`, `@macos`, `@windows` — prefer these over runtime conditionals
-- **Do NOT edit generated dirs**: `buildroot/`, `source/`, `downloads/`, `pkgroot/`

.github/skills/staticphp-build-troubleshooting/SKILL.md

@@ -1,56 +0,0 @@
----
-name: staticphp-build-troubleshooting
-description: Diagnose StaticPHP v3 failures. Use when investigating build, compile, linker, download, doctor, environment, CI, smoke-test, terminal output, spc.output.log, spc.shell.log, config.log, CMake logs, or user-provided error snippets from StaticPHP commands.
----
-
-# StaticPHP Build Troubleshooting
-
-## Overview
-
-Use this skill to triage StaticPHP failures from the outside in: command and environment first, SPC module/stage metadata next, shell/config logs last. The goal is to isolate the failing package, stage, command, and root cause before editing code.
-
-## First Pass
-
-1. Capture the exact command, OS, architecture, PHP version, extensions/libs/targets, and whether the run used `-v`, `-vv`, or `-vvv`.
-2. Read the final terminal error first. StaticPHP prints module error info, failed package, failed stage, failed command, log paths, and extra log files when available.
-3. If log files exist, inspect them in this order:
-   - `log/spc.output.log`: user-facing SPC messages and exception summary.
-   - `log/spc.shell.log`: executed commands, working directories, env, stdout/stderr.
-   - Extra logs named in the exception output: `php-src.config.log`, `lib.<pkg>.console.log`, `lib.<pkg>.cmake-error.log`, `lib.<pkg>.cmake-configure.log`, `lib.<pkg>.cmake-output.log`.
-4. Read `references/log-triage.md` for pattern matching, likely causes, and next checks.
-
-## Diagnosis Rules
-
-- Do not start by changing shared core code. Most failures are package metadata, environment, upstream source, dependency order, or platform flags.
-- Prefer evidence from the last failing command over earlier warnings.
-- When logs are long, search backward for `Command exited`, `error:`, `undefined reference`, `not found`, `No package`, `CMake Error`, `configure: error`, `fatal error`, `Failed module`, and `Failed stage`.
-- Use `config.log` and CMake logs for configure detection failures; use `spc.shell.log` for the actual command and env.
-- Be careful with rebuild suggestions. `spc reset --with-download --yes` is destructive to caches; ask before clearing caches unless the user explicitly asked.
-
-## Repro Commands
-
-Use focused commands when reproducing:
-
-```bash
-php bin/spc doctor -vvv
-php bin/spc download --for-extensions="curl,openssl" --with-php=8.5 --parallel=4 --retry=3 -vvv
-php bin/spc build:libs "openssl" -vvv
-php bin/spc build:php "bcmath,openssl,curl" --build-cli -vvv
-php bin/spc dev:lint-config
-```
-
-Choose the smallest command that still reaches the failing package.
-
-## Fix Direction
-
-After finding the failing package/stage:
-
-- Package YAML issue: use `$staticphp-package-maintenance`, then edit `config/pkg/*` or `config/artifact/*`.
-- Build command or patch issue: inspect the package class under `src/Package/*`.
-- Environment issue: check `doctor`, toolchain classes, and `config/pkg/tool/*`.
-- Upstream download issue: check artifact type, regex, GitHub rate limiting, mirror behavior, and `GITHUB_TOKEN`.
-- Core exception/logging issue: inspect `src/StaticPHP/Exception`, `src/StaticPHP/Runtime/Shell`, or executor classes only after package-level causes are ruled out.
-
-## Resources
-
-- `references/log-triage.md`: log files, failure categories, search patterns, and likely fixes.

.github/skills/staticphp-build-troubleshooting/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "StaticPHP Build Troubleshooting"
-  short_description: "Diagnose StaticPHP build and log failures."
-  default_prompt: "Use $staticphp-build-troubleshooting to investigate a StaticPHP build, download, doctor, or log failure."

.github/skills/staticphp-build-troubleshooting/references/log-triage.md

@@ -1,209 +0,0 @@
-# StaticPHP Log Triage
-
-## Contents
-
-- Log files
-- Terminal summary
-- Search strategy
-- Failure categories
-- Rebuild hygiene
-- Reporting checklist
-
-## Log Files
-
-Default log directory is `log/`, controlled by `SPC_LOGS_DIR`. The important files are:
-
-- `spc.output.log`: StaticPHP console/logger output and exception summaries.
-- `spc.shell.log`: command execution log with command, caller, inline env, working directory, stdout, stderr, and exit code.
-- `php-src.config.log`: copied when PHP source configure fails.
-- `lib.<pkg>.console.log`: copied Autoconf `config.log` for a library when available.
-- `lib.<pkg>.cmake-configure.log`: copied CMake 3.26+ configure log.
-- `lib.<pkg>.cmake-error.log`: copied CMake error log.
-- `lib.<pkg>.cmake-output.log`: copied CMake output log.
-
-Logs are created when `SPC_ENABLE_LOG_FILE` is true. Old `*.log` files are cleaned unless `SPC_PRESERVE_LOG` is set to a truthy value. The code in `src/bootstrap.php` reads `SPC_PRESERVE_LOG` (no trailing S).
-
-## Terminal Summary
-
-StaticPHP exceptions often print:
-
-- Exception category: build, download, environment, execution, file system, patch, validation, wrong usage, registry, internal.
-- Failed module: package name, type, and sometimes class/file/line.
-- Failed stage: call chain such as `build` or `build -> configure`.
-- Failed command: the command that returned non-zero.
-- Command working directory and inline env.
-- Paths to `spc.output.log`, `spc.shell.log`, and extra logs.
-
-Use this summary to choose the first files to read. If a package and stage are present, start with that package's YAML and class after reading the relevant log tail.
-
-## Search Strategy
-
-For long logs, search from the end first.
-
-Useful patterns:
-
-```text
-Failed module:
-Failed stage:
-Failed command:
-Command exited with non-zero code
-configure: error
-CMake Error
-undefined reference
-cannot find -l
-fatal error:
-No package
-Package .* not found
-Could NOT find
-is not a valid
-permission denied
-curl: (
-HTTP/2 403
-rate limit
-```
-
-In `spc.shell.log`, each command block begins with `>>>>>>>>>>>>>>>>>>>>>>>>>>`, then prints the command, caller, env, and working dir. The last failed block is usually the highest-value evidence.
-
-## Failure Categories
-
-### Download Failure
-
-Signs:
-
-- `Download failed`
-- `curl: (56)`, `curl: (22)`, HTTP 403/404/429
-- GitHub API calls in verbose logs
-- Asset regex did not match a release asset
-
-Likely checks:
-
-- If GitHub rate limited, ask user to set `GITHUB_TOKEN`.
-- Verify artifact source type and regex in `config/pkg/*` or `config/artifact/*`.
-- Use `--dl-retry`, `--dl-parallel`, `--ignore-cache`, `--no-alt`, or custom source options only as repro aids.
-- Prefer fixing stale URLs/regexes over adding workarounds.
-
-### Doctor or Environment Failure
-
-Signs:
-
-- `Environment check failed`
-- missing `make`, `cmake`, `autoconf`, `pkg-config`, compiler, Perl, Visual Studio, MSYS2, Zig, etc.
-- `Some check items can not be fixed`
-
-Likely checks:
-
-- Run `php bin/spc doctor -vvv`.
-- Inspect `src/StaticPHP/Doctor/Item/*` for the check and fix behavior.
-- Inspect `config/pkg/tool/*` for installable helper tools.
-- On Windows, some dependencies cannot be auto-installed.
-
-### Configure Failure
-
-Signs:
-
-- `configure: error`
-- Autoconf failure before compilation
-- extra `config.log` listed
-
-Likely checks:
-
-- Read copied `php-src.config.log` or `lib.<pkg>.console.log`.
-- Look for the first compiler/linker probe that failed.
-- Check `headers`, `static-libs`, `pkg-configs`, dependency order, and `initializeEnv($pkg)` behavior.
-- For extensions, check `php-extension.arg-type` and `#[CustomPhpConfigureArg]`.
-
-### CMake Failure
-
-Signs:
-
-- `CMake Error`
-- `Could NOT find`
-- missing target, package config, or static library
-
-Likely checks:
-
-- Read `lib.<pkg>.cmake-error.log` and `lib.<pkg>.cmake-configure.log`.
-- Inspect `UnixCMakeExecutor`/`WindowsCMakeExecutor` usage in the package class.
-- Check CMake options, toolchain root path, `pkg-configs`, and transitive dependency libraries.
-
-### Compile Failure
-
-Signs:
-
-- compiler `fatal error: header.h: No such file or directory`
-- syntax/type errors from upstream source
-- incompatible PHP API or platform macros
-
-Likely checks:
-
-- Identify the source file and include path from `spc.shell.log`.
-- Verify dependency headers are installed in `buildroot/include`.
-- Check PHP version compatibility and existing patches in `src/globals/patch`.
-- Prefer targeted patches or compile flags in the package class over broad toolchain changes.
-
-### Link Failure
-
-Signs:
-
-- `undefined reference`
-- `cannot find -lfoo`
-- duplicate symbols
-- Windows unresolved external symbol or missing `.lib`
-
-Likely checks:
-
-- Verify `static-libs`, dependency order, and `getStaticLibFiles()` usage.
-- Inspect `SPC_EXTRA_LIBS`, `Libs.private` in `.pc` files, and package-specific pkg-config patching.
-- On Windows, confirm `.lib` names and required system libraries.
-- For OpenSSL/curl-like packages, search existing linker flag hooks before adding a new one.
-
-### Smoke Test or Validation Failure
-
-Signs:
-
-- `Validation failed`
-- `php --ri` failure
-- extension not loaded after build
-- micro/embed runtime smoke test fails
-
-Likely checks:
-
-- Check extension `display-name`; empty string skips `php --ri`.
-- Confirm static vs shared build settings.
-- Confirm the extension is included in the final SAPI target and not only built as a dependency.
-- Inspect `src/globals/ext-tests/*` and common tests for expected runtime behavior.
-
-### Registry or Config Failure
-
-Signs:
-
-- `Registry error`
-- unknown package, invalid field, invalid platform suffix, type mismatch
-- package referenced by attribute but missing config
-
-Likely checks:
-
-- Run `php bin/spc dev:lint-config`.
-- Inspect `ConfigValidator` tests for accepted fields and error expectations.
-- Confirm attribute type matches YAML `type`.
-- Confirm hooks reference existing package names and stages for the current platform.
-
-## Rebuild Hygiene
-
-Use the smallest cleanup that can invalidate the suspected stale state:
-
-- Redownload one artifact: `--ignore-cache="artifact-name"`.
-- Skip downloads to test local source/build logic: `--no-download`.
-- Prefer source when debugging build logic: `--dl-prefer-source`.
-- Clear build products only when necessary. `spc reset --with-download --yes` removes caches and should not be suggested casually.
-
-## Reporting Checklist
-
-When preparing an issue or PR explanation, include:
-
-- Exact `php bin/spc ...` command.
-- OS, architecture, PHP version option, and relevant env vars.
-- Failed package and stage.
-- Last failed command and exit code.
-- Tail of `spc.output.log`, relevant command block from `spc.shell.log`, and any extra config/CMake log.
-- Whether the failure reproduces after a focused clean or cache refresh.

.github/skills/staticphp-package-maintenance/SKILL.md

@@ -1,55 +0,0 @@
----
-name: staticphp-package-maintenance
-description: Maintain StaticPHP v3 packages and artifacts. Use when adding, modifying, reviewing, or validating config under config/pkg or config/artifact; package classes under src/Package; extension/library/target/tool dependencies; PHP configure args; build hooks; package metadata; or related tests and docs.
----
-
-# StaticPHP Package Maintenance
-
-## Overview
-
-Use this skill to make focused package changes without re-reading the entire repository. StaticPHP v3 separates declarative package/artifact YAML from package-specific PHP build logic; prefer config-only edits unless current patterns require a class.
-
-## Quick Workflow
-
-1. Identify the package kind and exact name.
-   - Extension: `config/pkg/ext/ext-name.yml`, class `src/Package/Extension/name.php`.
-   - Library: `config/pkg/lib/name.yml`, class `src/Package/Library/name.php`.
-   - Target or virtual target: `config/pkg/target/name.yml`, class `src/Package/Target/name.php`.
-   - Tool: `config/pkg/tool/name.yml`, class `src/Package/Tool/name.php`.
-   - Shared/custom artifact: `config/artifact/name.yml`, class `src/Package/Artifact/name.php`.
-
-2. Search for the closest existing package before designing anything new.
-   - Similar build system: `rg "#\\[BuildFor|UnixCMakeExecutor|UnixAutoconfExecutor|WindowsCMakeExecutor" src/Package`.
-   - Similar config fields: `rg "static-libs|pkg-configs|arg-type|depends@" config/pkg`.
-   - Similar download type: `rg "type: ghrel|type: pecl|type: pie|type: git|binary: hosted" config`.
-
-3. Read `references/package-reference.md` when changing YAML fields, artifact definitions, package naming, dependencies, platform suffixes, or validation expectations.
-
-4. Read `references/build-class-patterns.md` when PHP build logic, attributes, lifecycle hooks, custom configure args, source patching, or executor usage is needed.
-
-5. Validate narrowly, then broadly if risk warrants it.
-   - Config lint: `php bin/spc dev:lint-config`
-   - Focused tests: `vendor/bin/phpunit tests/StaticPHP/Config tests/StaticPHP/Registry tests/StaticPHP/Util/DependencyResolverTest.php --no-coverage`
-   - Full project checks: `composer test`, `composer analyse`
-
-## Editing Rules
-
-- Treat `config/pkg/*` and `config/artifact/*` as the source of package truth; package classes augment behavior.
-- Use platform suffix fields for declarative OS differences: `@unix`, `@linux`, `@macos`, `@windows`.
-- Add a PHP class only for custom build stages, validation, hook behavior, patches, or custom configure arguments.
-- Keep extension dependencies prefixed with `ext-`; libraries, tools, and targets use their package names.
-- Prefer existing helpers such as `UnixAutoconfExecutor`, `UnixCMakeExecutor`, `WindowsCMakeExecutor`, `shell()`, `cmd()`, and `FileSystem`.
-- Do not modify build outputs (`buildroot/`, `source/`, `downloads/`, `pkgroot/`) to fix package definitions.
-- If upstream metadata changes, update license metadata and smoke-test/display names when relevant.
-
-## Common Task Paths
-
-- Add a new PECL extension: define `config/pkg/ext/ext-name.yml` with `type: php-extension`, `artifact.source.type: pecl`, dependencies, and `php-extension.arg-type`; add a class only if configure args, patches, or hooks are non-standard.
-- Add a library: define `config/pkg/lib/name.yml` with artifact, dependencies, and install verification fields (`headers`, `static-libs`, `pkg-configs`, `static-bins`); add build class methods by OS.
-- Fix an existing package build: start from the failing package config/class, then inspect dependencies and hooks targeting that package before changing shared core code.
-- Update a version source: prefer artifact fields that support update checking (`ghrel`, `ghtar`, `ghtagtar`, `git` with regex, `filelist`, `pecl`, `pie`) over hard-coded URLs when upstream supports it.
-
-## Resources
-
-- `references/package-reference.md`: YAML package/artifact model, naming, fields, validation, and commands.
-- `references/build-class-patterns.md`: PHP package attributes, stages, hooks, executors, and class patterns.

.github/skills/staticphp-package-maintenance/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "StaticPHP Package Maintenance"
-  short_description: "Add, update, and validate StaticPHP v3 package definitions."
-  default_prompt: "Use $staticphp-package-maintenance to add, modify, or review StaticPHP package and artifact definitions."

.github/skills/staticphp-package-maintenance/references/build-class-patterns.md

@@ -1,143 +0,0 @@
-# StaticPHP Build Class Patterns
-
-## Contents
-
-- When a class is needed
-- Package attributes
-- Stage and hook behavior
-- Executor choices
-- Common patterns
-- Failure-safe edits
-
-## When a Class Is Needed
-
-Do not add a PHP package class for simple metadata. Use YAML alone when StaticPHP can infer the configure args, dependencies, and verification.
-
-Add or update a class when the package needs:
-
-- OS-specific build commands.
-- Custom validation before building.
-- Custom PHP configure arguments.
-- Patches or file edits before build.
-- Hooks into another package's stage.
-- Custom source/binary download or extraction logic.
-- Package info shown by dev tooling.
-
-Package classes live in `src/Package/*` and are discovered through PSR-4 plus attributes. Config must exist first; `PackageLoader` throws if an attribute references an undefined package.
-
-## Package Attributes
-
-Class-level package attributes:
-
-- `#[Extension('curl')]` maps to package `ext-curl` if the prefix is omitted.
-- `#[Library('openssl')]`
-- `#[Target('php')]`
-- `#[Tool('zig')]`
-
-Method-level attributes:
-
-- `#[BuildFor('Linux'|'Darwin'|'Windows')]`: registers the `build` stage for that OS.
-- `#[Stage('name')]`: registers a named stage; defaults to the method name when omitted.
-- `#[BeforeStage('package', 'stage', 'only-when-package-resolved')]`: hook before a target package stage.
-- `#[AfterStage('package', 'stage', 'only-when-package-resolved')]`: hook after a target package stage.
-- `#[PatchBeforeBuild]`: runs once before package build unless `.spc-patched` exists; return `true` to write that marker.
-- `#[CustomPhpConfigureArg('Linux')]`: supplies custom extension configure args.
-- `#[Validate]`: validates environment/source assumptions.
-- `#[Info]`: returns package information for tooling.
-- `#[InitPackage]`: runs while loading a package class.
-- `#[ResolveBuild]`: target package callback for resolving build dependencies.
-- `#[ConditionalOn(SomeClass::class)]`: conditionally enables before/after hooks only when DI has the class.
-
-## Stage and Hook Behavior
-
-`PackageBuilder::buildPackage()` does:
-
-1. Ensure build directories exist.
-2. Skip if already installed unless forced.
-3. Ensure source exists for non-virtual packages.
-4. Emit `PatchBeforeBuild` callbacks.
-5. Run the `build` stage.
-6. Install license data.
-7. Record tool package versions where relevant.
-
-`Package::runStage()` wraps a stage with:
-
-1. `BeforeStage` callbacks.
-2. The stage method itself.
-3. `AfterStage` callbacks.
-
-SPC exceptions bind package and stage metadata. Preserve that behavior by throwing existing `SPCException` subclasses instead of raw exceptions when adding new failure paths.
-
-## Executor Choices
-
-Use existing executors where possible:
-
-- `UnixAutoconfExecutor`: for Unix packages using `./configure && make && make install`. It injects default static flags and copies `config.log` into SPC logs on failure.
-- `UnixCMakeExecutor`: for Unix CMake packages. It writes toolchain settings and copies CMake configure/error/output logs on failure.
-- `WindowsCMakeExecutor`: for Windows CMake packages.
-- `shell()->cd(...)->initializeEnv($pkg)`: for custom Unix command chains.
-- `cmd()->cd(...)`: for Windows command chains.
-
-Prefer `FileSystem` helpers for file edits and copies so behavior stays consistent.
-
-## Common Patterns
-
-Minimal library class:
-
-```php
-#[Library('example')]
-class example
-{
-    #[BuildFor('Linux')]
-    public function build(LibraryPackage $pkg): void
-    {
-        (new UnixAutoconfExecutor($pkg))
-            ->configure()
-            ->make();
-    }
-}
-```
-
-Extension hook into PHP build:
-
-```php
-#[Extension('curl')]
-class curl
-{
-    #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-curl')]
-    public function patchBeforePhpBuild(): void
-    {
-        // Adjust env, generated build files, or linker flags.
-    }
-}
-```
-
-Validation:
-
-```php
-#[Validate]
-public function validate(): void
-{
-    if (SystemTarget::getTargetOS() === 'Windows' && WindowsUtil::findCommand('perl.exe') === null) {
-        throw new EnvironmentException('You need to install perl first!');
-    }
-}
-```
-
-Custom configure args should be used when YAML `arg-type` is `custom` or when args need package/install context:
-
-```php
-#[CustomPhpConfigureArg('Linux')]
-public function configureArg(PhpExtensionPackage $ext): string
-{
-    return '--with-example=' . $ext->getBuildRootPath();
-}
-```
-
-## Failure-Safe Edits
-
-- Make hooks conditional with the third `BeforeStage`/`AfterStage` argument when a dependency must be resolved before the hook should run.
-- Keep platform-specific code under matching `#[BuildFor]` methods rather than branching heavily inside one method.
-- If a patch changes upstream source, place patch files in `src/globals/patch/` and describe them with `#[PatchDescription]` where appropriate.
-- If a class only mutates environment variables for another package, search for existing hooks first to avoid duplicate linker flags.
-- After adding attributes, run registry/config tests because invalid stages and unknown packages are caught during loading.

.github/skills/staticphp-package-maintenance/references/package-reference.md

@@ -1,157 +0,0 @@
-# StaticPHP Package Reference
-
-## Contents
-
-- Package locations
-- Package types
-- Artifact model
-- Common YAML fields
-- PHP extension fields
-- Platform suffixes
-- Validation and tests
-
-## Package Locations
-
-StaticPHP v3 keeps package metadata in YAML and behavior in PHP classes.
-
-| Kind | YAML | PHP class namespace | Typical attribute |
-|---|---|---|---|
-| PHP extension | `config/pkg/ext/ext-name.yml` | `Package\Extension` | `#[Extension('name')]` |
-| Library | `config/pkg/lib/name.yml` | `Package\Library` | `#[Library('name')]` |
-| Target | `config/pkg/target/name.yml` | `Package\Target` | `#[Target('name')]` |
-| Virtual target | `config/pkg/target/name.yml` | `Package\Target` | `#[Target('name')]` |
-| Tool | `config/pkg/tool/name.yml` | `Package\Tool` | `#[Tool('name')]` |
-| Custom artifact | `config/artifact/name.yml` | `Package\Artifact` | artifact attributes |
-
-Prefer one package per YAML file unless an existing file groups related definitions. Match nearby naming and ordering.
-
-## Package Types
-
-`php-extension` packages describe PHP extensions. Config package names must use the `ext-` prefix. Dependencies on extensions also use `ext-`.
-
-`library` packages describe buildable dependency libraries. They usually define source artifacts plus verification fields such as headers, static libraries, pkg-config files, or binaries.
-
-`target` packages represent final build outputs and inherit the library-style fields. StaticPHP automatically exposes build commands for targets.
-
-`virtual-target` packages are abstract dependency/build scheduling nodes. They may omit `artifact`.
-
-`tool` packages are helper programs or toolchains installed into `pkgroot/` or used by builds.
-
-## Artifact Model
-
-Artifacts define downloadable source archives or prebuilt binaries. Use inline artifacts for simple one-package sources and `config/artifact/*.yml` for shared, complex, or custom artifacts.
-
-Top-level artifact sections:
-
-- `source`: source archive, git checkout, PECL/PIE package, local directory, or custom source.
-- `binary`: prebuilt binary by platform, or aliases such as `hosted`/`custom`.
-- `metadata`: `license`, `license-files`, and `source-root`.
-
-Common source types:
-
-- `url`: fixed URL; supports `filename`, `version`, and `extract`.
-- `git`: repository source; use `rev` for a fixed branch/tag/commit or `regex` with named `version` capture for update checks.
-- `ghrel`: GitHub release asset by regex filename match.
-- `ghtar`: generated GitHub release tarball.
-- `ghtagtar`: generated GitHub tag tarball.
-- `filelist`: scrape a download index and extract version/filename with regex.
-- `pecl`: PECL extension by name.
-- `pie`: Packagist PIE extension by `vendor/package`.
-- `php-release`: official PHP source selected by build PHP version.
-- `local`: local source directory for development/offline use.
-- `custom`: PHP artifact class handles source or binary logic.
-
-Use `metadata.source-root` when the actual build directory is inside an extracted subdirectory.
-
-Use `metadata.license-files` for source licenses. `@/file.txt` points to bundled license files in `src/globals/licenses/`.
-
-## Common YAML Fields
-
-Shared fields:
-
-- `type`: required package type.
-- `description`: optional human-readable package description.
-- `license`: package-level license annotation where applicable.
-- `lang`: implementation language such as `c` or `c++`.
-- `frameworks`: macOS framework tags.
-- `artifact`: string reference or inline artifact object. Required for `library` and `target`; optional for built-in extensions and virtual targets.
-- `depends`: hard dependencies.
-- `suggests`: optional dependencies.
-
-Library, target, and tool verification/installation fields:
-
-- `headers`: expected files/directories under `buildroot/include`.
-- `static-libs`: expected static libraries under `buildroot/lib`.
-- `pkg-configs`: expected `.pc` files under `buildroot/lib/pkgconfig`.
-- `static-bins`: expected executables under `buildroot/bin`.
-- `path`: directories appended to PATH after install.
-- `env`: environment variables set after install.
-- `append-env`: values appended to existing environment variables.
-
-Path placeholders in `path`, `env`, and `append-env`:
-
-- `{build_root_path}`: `buildroot/`
-- `{pkg_root_path}`: `pkgroot/`
-- `{working_dir}`: repository or working directory
-- `{download_path}`: `downloads/`
-- `{source_path}`: `source/`
-- `{spc_msys2_path}`: MSYS2 root on Windows
-
-## PHP Extension Fields
-
-Extension-specific fields live under `php-extension`.
-
-- `arg-type`: configure argument behavior. Built-ins include `enable`, `enable-path`, `with`, `with-path`, `custom`, and `none`. Full strings are allowed.
-- `zend-extension`: true for Zend extensions such as opcache/xdebug.
-- `build-shared`: whether shared builds are allowed.
-- `build-static`: whether static builds are allowed.
-- `build-with-php`: true when built inside the PHP source tree.
-- `display-name`: value used for `php --ri` smoke tests and license display; empty string skips the `--ri` check.
-- `os`: allowed OS families: `Linux`, `Darwin`, `Windows`.
-
-Configure string placeholders:
-
-- `@build_root_path@`: absolute buildroot path.
-- `@shared_suffix@`: `=shared` in shared builds, empty in static builds.
-- `@shared_path_suffix@`: `=shared,{buildroot}` in shared builds, `={buildroot}` in static builds.
-
-## Platform Suffixes
-
-Many fields support platform suffixes:
-
-- `@unix`: Linux and macOS.
-- `@linux`: Linux only.
-- `@macos`: macOS only.
-- `@windows`: Windows only.
-
-For Linux, specific fields override generic fields in this order: `field@linux`, then `field@unix`, then `field`.
-
-Use suffixes for declarative differences in dependencies, headers, libraries, pkg-configs, extension args, and suggestions.
-
-## Validation and Tests
-
-Run config validation for most package edits:
-
-```bash
-php bin/spc dev:lint-config
-```
-
-Run focused tests after config or registry changes:
-
-```bash
-vendor/bin/phpunit tests/StaticPHP/Config tests/StaticPHP/Registry tests/StaticPHP/Util/DependencyResolverTest.php --no-coverage
-```
-
-Run broader checks for framework or class changes:
-
-```bash
-composer test
-composer analyse
-```
-
-Build commands are expensive. Use them for user-provided repros, package-specific fixes, or when validation cannot prove the behavior:
-
-```bash
-php bin/spc build:libs "openssl,curl" -vvv
-php bin/spc build:php "bcmath,openssl,curl" --build-cli -vvv
-```

AGENTS.md

@@ -1,59 +0,0 @@
-# StaticPHP v3 Agent Guide
-
-StaticPHP is a PHP CLI application for building static PHP binaries, PHP SAPIs, extensions, libraries, helper tools, and project bundles. Prefer the v3 architecture under `src/StaticPHP`, `src/Package`, `config/pkg`, and `config/artifact`.
-
-This file is the shared entry point for coding agents such as Codex, OpenCode, Claude-compatible agents, and GitHub Copilot agents. GitHub Copilot also has `.github/copilot-instructions.md`.
-
-## Skills
-
-Detailed task workflows live in `.github/skills`. Use them when the task matches:
-
-- `.github/skills/staticphp-package-maintenance`: add, modify, review, or validate package, artifact, extension, library, target, or tool definitions.
-- `.github/skills/staticphp-build-troubleshooting`: diagnose build, download, doctor, shell, terminal, CI, smoke-test, or log failures.
-
-If your agent does not automatically discover skills from `.github/skills`, read the matching `SKILL.md` manually before working on that task.
-
-## Project Map
-
-- `bin/spc`: primary CLI entrypoint.
-- `composer.json`: PHP 8.4+, Symfony Console, DI, YAML, logger; useful scripts are `composer test`, `composer analyse`, `composer lint-config`, and `composer cs-fix`.
-- `spc.registry.yml`: built-in `core` registry.
-- `config/pkg/ext`: PHP extension package YAML, usually named `ext-*.yml`.
-- `config/pkg/lib`: library package YAML.
-- `config/pkg/target`: final build target and virtual target YAML.
-- `config/pkg/tool`: helper tool package YAML.
-- `config/artifact`: standalone artifact YAML for shared or complex sources/binaries.
-- `log/`: build and shell execution logs (`spc.output.log`, `spc.shell.log`, and per-package CMake/config logs); controlled by `SPC_LOGS_DIR` and `SPC_ENABLE_LOG_FILE`.
-- `src/StaticPHP`: framework core: registry loading, config validation, dependency resolution, package install/build pipeline, doctor, toolchains, runtime shell/executors, exceptions.
-- `src/Package`: package-specific build logic registered by PHP attributes.
-- `src/globals`: constants, helper functions, patches, smoke tests, bundled license text.
-- `tests`: PHPUnit tests for config, registry, artifacts, dependency resolver, DI, commands, and utilities.
-- `docs/en/develop` and `docs/zh/develop`: developer documentation. Some pages may be TODO; verify against source when behavior matters.
-
-## Working Rules
-
-- Keep changes scoped to the requested package, artifact, command, docs, or tests.
-- Prefer existing package patterns over new abstractions. Search for a similar package first.
-- Use structured YAML config; do not encode dependency logic in PHP when config fields are enough.
-- Match package names exactly: extension packages use `ext-` in config and dependencies; `#[Extension('curl')]` expands to `ext-curl`.
-- Use platform suffixes such as `@unix`, `@linux`, `@macos`, and `@windows` instead of runtime conditionals when the difference is declarative.
-- Add or update PHP package classes only when build commands, validation, custom configure args, hooks, or source patching are required.
-- Do not edit generated build directories (`buildroot/`, `source/`, `downloads/`, `pkgroot/`) as a fix.
-
-## Validation
-
-For config or package changes, run CS checks first:
-
-```bash
-bin/spc dev:lint-config
-composer cs-fix
-```
-
-For broader PHP code changes, also run:
-
-```bash
-composer test
-composer analyse
-```
-
-Use build commands only when needed for the task or when the user provided a repro, because full static builds can be slow and platform-sensitive.

README-zh.md

@@ -104,7 +104,7 @@ echo '<?php echo "Hello world!\n";' > a.php
 
 ## 直接下载
 
-如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物，或从自托管服务器下载。
+如果你暂时不想构建，或只想先测试，可以从 [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) 下载示例预编译产物，或从自托管服务器下载。
 
 我们为每个 PHP 版本提供 2 种扩展集合：
 

README.md

@@ -104,7 +104,7 @@ see <https://static-php.dev>.
 
 ## Direct Download
 
-If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
+If you do not want to build yet or just want to test first, you can download example pre-compiled artifacts from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml) or from a self-hosted server.
 
 We offer 2 types of extension sets for each PHP version:
 

box.json

@@ -10,6 +10,7 @@
         "config",
         "src",
         "vendor/psr",
+        "vendor/laravel/prompts",
         "vendor/symfony",
         "vendor/php-di",
         "vendor/zhamao"

composer.json

@@ -12,8 +12,10 @@
         "php": ">=8.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
+        "laravel/prompts": "~0.1",
         "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
+        "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
         "zhamao/logger": "^1.1.4"
     },

config/artifact/ncurses.yml

@@ -3,10 +3,6 @@ ncurses:
     license-files:
       - COPYING
   source:
-    type: filelist
-    url: 'https://ftp.gnu.org/gnu/ncurses/'
-    regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'
-  source-mirror:
     type: filelist
     url: 'https://ftpmirror.gnu.org/gnu/ncurses/'
     regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'

config/env.ini

@@ -53,8 +53,8 @@ PHP_BUILD_PROVIDER="StaticPHP ${SPC_VERSION}"
 SPC_ENABLE_LOG_FILE="yes"
 ; The LOG DIR for spc logs
 SPC_LOGS_DIR="${WORKING_DIR}/log"
-; Preserve old logs when running new builds (code checks SPC_PRESERVE_LOG, not SPC_PRESERVE_LOGS)
+; Preserve old logs when running new builds
-SPC_PRESERVE_LOG="no"
+SPC_PRESERVE_LOGS="no"
 
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
 ; only useful for builds targeting not pure-static linking
@@ -68,8 +68,8 @@ SPC_PRESERVE_LOG="no"
 [windows]
 ; build target: win7-static
 SPC_TARGET=native-windows
-; MSYS2 root directory (msys64 subfolder), used by the Windows toolchain
+; php-sdk-binary-tools path
-SPC_MSYS2_PATH="${PKG_ROOT_PATH}\msys2-build-essentials\msys64"
+PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
 ; upx executable path
 UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches

config/pkg/ext/ext-fastchart.yml

@@ -1,20 +0,0 @@
-ext-fastchart:
-  type: php-extension
-  artifact:
-    source:
-      type: ghtar
-      repo: iliaal/fastchart
-      extract: php-src/ext/fastchart
-      prefer-stable: true
-    metadata:
-      license-files: [LICENSE]
-  depends:
-    - freetype
-  suggests:
-    - libpng
-    - libjpeg
-    - libwebp
-  php-extension:
-    os:
-      - Linux
-      - Darwin

config/pkg/ext/ext-fastjson.yml

@@ -1,14 +0,0 @@
-ext-fastjson:
-  type: php-extension
-  artifact:
-    source:
-      type: ghtar
-      repo: iliaal/fastjson
-      extract: php-src/ext/fastjson
-      prefer-stable: true
-    metadata:
-      license-files: [LICENSE]
-  php-extension:
-    os:
-      - Linux
-      - Darwin

config/pkg/ext/ext-gmssl.yml

@@ -10,5 +10,3 @@ ext-gmssl:
       license: PHP-3.01
   depends:
     - gmssl
-  php-extension:
-    arg-type: with-path

config/pkg/ext/ext-imagick.yml

@@ -13,4 +13,5 @@ ext-imagick:
     os:
       - Linux
       - Darwin
+      - Windows
     arg-type: custom

config/pkg/ext/ext-zip.yml

@@ -10,11 +10,6 @@ ext-zip:
       license: PHP-3.01
   depends:
     - libzip
-  depends@windows:
-    - libzip
-    - zlib
-    - xz
-    - bzip2
   php-extension:
     arg-type: custom
     arg-type@windows: enable

config/pkg/lib/gettext.yml

@@ -2,10 +2,6 @@ gettext:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gettext/'
-      regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gettext/'
       regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'

config/pkg/lib/gmp.yml

@@ -2,13 +2,12 @@ gmp:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gmp/'
-      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gmp/'
       regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
+    source-mirror:
+      type: url
+      url: 'https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz'
     metadata:
       license-files: ['@/gmp.txt']
       license: Custom

config/pkg/lib/idn2.yml

@@ -2,10 +2,6 @@ idn2:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libidn/'
-      regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libidn/'
       regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/imagemagick.yml

@@ -16,13 +16,59 @@ imagemagick:
     - libtiff
     - libheif
     - bzip2
+  depends@windows:
+    - zlib
   suggests:
     - zstd
     - xz
     - libzip
     - libxml2
+  headers@windows:
+    - imagemagick/MagickWand/MagickWand.h
   lang: cpp
   pkg-configs:
     - Magick++-7.Q16HDRI
     - MagickCore-7.Q16HDRI
     - MagickWand-7.Q16HDRI
+  static-libs@windows:
+    - CORE_RL_MagickWand_.lib
+    - CORE_RL_MagickCore_.lib
+    - CORE_RL_coders_.lib
+    - CORE_RL_filters_.lib
+    - CORE_RL_aom_.lib
+    - CORE_RL_brotli_.lib
+    - CORE_RL_bzip2_.lib
+    - CORE_RL_cairo_.lib
+    - CORE_RL_croco_.lib
+    - CORE_RL_de265_.lib
+    - CORE_RL_exr_.lib
+    - CORE_RL_ffi_.lib
+    - CORE_RL_freetype_.lib
+    - CORE_RL_fribidi_.lib
+    - CORE_RL_gdk-pixbuf_.lib
+    - CORE_RL_glib_.lib
+    - CORE_RL_harfbuzz_.lib
+    - CORE_RL_heif_.lib
+    - CORE_RL_highway_.lib
+    - CORE_RL_imath_.lib
+    - CORE_RL_jpeg-turbo-12_.lib
+    - CORE_RL_jpeg-turbo-16_.lib
+    - CORE_RL_jpeg-turbo_.lib
+    - CORE_RL_jpeg-xl_.lib
+    - CORE_RL_lcms_.lib
+    - CORE_RL_lqr_.lib
+    - CORE_RL_lzma_.lib
+    - CORE_RL_openh264_.lib
+    - CORE_RL_openjpeg_.lib
+    - CORE_RL_openjph_.lib
+    - CORE_RL_pango_.lib
+    - CORE_RL_pixman_.lib
+    - CORE_RL_png_.lib
+    - CORE_RL_raqm_.lib
+    - CORE_RL_raw_.lib
+    - CORE_RL_rsvg_.lib
+    - CORE_RL_tiff_.lib
+    - CORE_RL_webp_.lib
+    - CORE_RL_xml_.lib
+    - CORE_RL_zip_.lib
+    - CORE_RL_zlib_.lib

config/pkg/lib/libiconv.yml

@@ -2,10 +2,6 @@ libiconv:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libiconv/'
-      regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libiconv/'
       regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libssh2.yml

@@ -9,10 +9,8 @@ libssh2:
     metadata:
       license-files: [COPYING]
       license: BSD-3-Clause
-  depends@unix:
+  depends:
     - openssl
-  depends@windows:
-    - zlib
   headers:
     - libssh2.h
     - libssh2_publickey.h

config/pkg/lib/libunistring.yml

@@ -2,10 +2,6 @@ libunistring:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libunistring/'
-      regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libunistring/'
       regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libzip.yml

@@ -11,6 +11,10 @@ libzip:
       license: BSD-3-Clause
   depends:
     - zlib
+  depends@windows:
+    - zlib
+    - bzip2
+    - xz
   suggests:
     - bzip2
     - xz

config/pkg/lib/openssl.yml

@@ -17,6 +17,7 @@ openssl:
     - zlib
   depends@windows:
     - zlib
+    - jom
   headers:
     - openssl
   static-libs@unix:
@@ -25,6 +26,3 @@ openssl:
   static-libs@windows:
     - libssl.lib
     - libcrypto.lib
-  tools@windows:
-    - jom
-    - strawberry-perl

config/pkg/lib/postgresql.yml

@@ -5,8 +5,6 @@ postgresql:
       type: ghtagtar
       repo: postgres/postgres
       match: REL_18_\d+
-    binary:
-      windows-x86_64: { type: url, url: 'https://get.enterprisedb.com/postgresql/postgresql-16.8-1-windows-x64-binaries.zip', extract: { lib/libpq.lib: '{build_root_path}/lib/libpq.lib', lib/libpgport.lib: '{build_root_path}/lib/libpgport.lib', lib/libpgcommon.lib: '{build_root_path}/lib/libpgcommon.lib', include/libpq-fe.h: '{build_root_path}/include/libpq-fe.h', include/postgres_ext.h: '{build_root_path}/include/postgres_ext.h', include/pg_config_ext.h: '{build_root_path}/include/pg_config_ext.h', include/libpq/libpq-fs.h: '{build_root_path}/include/libpq/libpq-fs.h' } }
     metadata:
       license-files: ['@/postgresql.txt']
       license: PostgreSQL
@@ -16,6 +14,9 @@ postgresql:
     - openssl
     - zlib
     - libedit
+  depends@windows:
+    - openssl
+    - zlib
   suggests@unix:
     - icu
     - libxslt

config/pkg/lib/readline.yml

@@ -2,10 +2,6 @@ readline:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/readline/'
-      regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/readline/'
       regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/target/frankenphp.yml

@@ -10,8 +10,10 @@ frankenphp:
       license: MIT
   depends:
     - php-embed
+    - go-xcaddy
   depends@windows:
     - php-embed
+    - go-win
     - pthreads4w
   suggests@unix:
     - brotli
@@ -22,7 +24,3 @@ frankenphp:
     - frankenphp
   static-bins@windows:
     - frankenphp.exe
-  tools:
-    - go-xcaddy
-  tools@windows:
-    - go-win

config/pkg/target/go-win.yml

@@ -1,5 +1,5 @@
 go-win:
-  type: tool
+  type: target
   artifact:
     binary: custom
   env:
@@ -8,8 +8,3 @@ go-win:
     GOPATH: '{pkg_root_path}/go-win/go'
   path@windows:
     - '{pkg_root_path}/go-win/bin'
-  tool:
-    provides:
-      - go.exe
-      - gofmt.exe
-    binary-subdir: go-win/bin

config/pkg/target/go-xcaddy.yml

@@ -1,5 +1,5 @@
 go-xcaddy:
-  type: tool
+  type: target
   artifact:
     binary: custom
   env:
@@ -8,8 +8,5 @@ go-xcaddy:
     GOPATH: '{pkg_root_path}/go-xcaddy/go'
   path@unix:
     - '{pkg_root_path}/go-xcaddy/bin'
-  tool:
+  static-bins:
-    provides:
+    - xcaddy
-      - go
-      - gofmt
-    binary-subdir: go-xcaddy/bin

config/pkg/target/jom.yml

@@ -1,11 +1,7 @@
 jom:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://download.qt.io/official_releases/jom/jom.zip', extract: '{pkg_root_path}/jom' }
   path@windows:
     - '{pkg_root_path}\jom'
-  tool:
-    provides:
-      - jom.exe
-    binary-subdir: jom

config/pkg/target/msys2-build-essentials.yml

@@ -1,8 +0,0 @@
-msys2-build-essentials:
-  type: target
-  artifact:
-    binary: custom
-  env:
-    SPC_MSYS2_PATH: '{pkg_root_path}/msys2-build-essentials/msys64'
-  path@windows:
-    - '{pkg_root_path}/msys2-build-essentials/msys64/usr/bin'

config/pkg/target/nasm.yml

@@ -0,0 +1,5 @@
+nasm:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{php_sdk_path}/bin/nasm.exe', ndisasm.exe: '{php_sdk_path}/bin/ndisasm.exe' } }

config/pkg/target/php-sdk-binary-tools.yml

@@ -0,0 +1,5 @@
+php-sdk-binary-tools:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: git, rev: master, url: 'https://github.com/php/php-sdk-binary-tools.git', extract: '{php_sdk_path}' }

config/pkg/target/pkg-config.yml

@@ -0,0 +1,9 @@
+pkg-config:
+  type: target
+  artifact:
+    source: 'https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz'
+    binary:
+      linux-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      linux-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-x86_64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-x86_64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
+      macos-aarch64: { type: ghrel, repo: static-php/static-php-cli-hosted, match: pkg-config-aarch64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }

config/pkg/target/protoc.yml

@@ -1,12 +1,8 @@
 protoc:
-  type: tool
+  type: target
   artifact:
     binary:
       linux-x86_64: { type: ghrel, repo: protocolbuffers/protobuf, match: 'protoc-([0-9.]+)-linux-x86_64\.zip', extract: '{pkg_root_path}/protoc' }
       linux-aarch64: { type: ghrel, repo: protocolbuffers/protobuf, match: 'protoc-([0-9.]+)-linux-aarch_64\.zip', extract: '{pkg_root_path}/protoc' }
   path:
     - '{pkg_root_path}/protoc/bin'
-  tool:
-    provides:
-      - protoc
-    binary-subdir: protoc/bin

config/pkg/target/strawberry-perl.yml

@@ -1,9 +1,5 @@
 strawberry-perl:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip', extract: '{pkg_root_path}/strawberry-perl' }
-  tool:
-    provides:
-      - perl.exe
-    binary-subdir: strawberry-perl/perl/bin

config/pkg/target/upx.yml

@@ -1,13 +1,7 @@
 upx:
-  type: tool
+  type: target
   artifact:
     binary:
       linux-x86_64: { type: ghrel, repo: upx/upx, match: upx.+-amd64_linux\.tar\.xz, extract: { upx: '{pkg_root_path}/bin/upx' } }
       linux-aarch64: { type: ghrel, repo: upx/upx, match: upx.+-arm64_linux\.tar\.xz, extract: { upx: '{pkg_root_path}/bin/upx' } }
       windows-x86_64: { type: ghrel, repo: upx/upx, match: upx.+-win64\.zip, extract: { upx.exe: '{pkg_root_path}/bin/upx.exe' } }
-  tool:
-    provides:
-      - upx
-    provides@windows:
-      - upx.exe
-    binary-subdir: bin

config/pkg/target/vswhere.yml

@@ -1,9 +1,5 @@
 vswhere:
-  type: tool
+  type: target
   artifact:
     binary:
       windows-x86_64: { type: url, url: 'https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe', extract: '{pkg_root_path}/bin/vswhere.exe' }
-  tool:
-    provides:
-      - vswhere.exe
-    binary-subdir: bin

config/pkg/target/zig.yml

@@ -0,0 +1,4 @@
+zig:
+  type: target
+  artifact:
+    binary: custom

config/pkg/tool/7za-win.yml

@@ -1,9 +0,0 @@
-7za-win:
-  type: tool
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/v3/tools/7zip/7za.exe', extract: '{pkg_root_path}/bin/7za.exe' }
-  tool:
-    provides:
-      - 7za.exe
-    binary-subdir: bin

config/pkg/tool/nasm.yml

@@ -1,10 +0,0 @@
-nasm:
-  type: tool
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{pkg_root_path}/bin/nasm.exe', ndisasm.exe: '{pkg_root_path}/bin/ndisasm.exe' } }
-  tool:
-    provides:
-      - nasm.exe
-      - ndisasm.exe
-    binary-subdir: bin

config/pkg/tool/pkg-config.yml

@@ -1,13 +0,0 @@
-pkg-config:
-  type: tool
-  artifact:
-    source: 'https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz'
-    binary:
-      linux-x86_64: { type: ghrel, repo: static-php/hosted, match: pkg-config-x86_64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      linux-aarch64: { type: ghrel, repo: static-php/hosted, match: pkg-config-aarch64-linux-musl-1.2.5.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      macos-x86_64: { type: ghrel, repo: static-php/hosted, match: pkg-config-x86_64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-      macos-aarch64: { type: ghrel, repo: static-php/hosted, match: pkg-config-aarch64-darwin.txz, extract: { bin/pkg-config: '{pkg_root_path}/bin/pkg-config' } }
-  tool:
-    provides:
-      - pkg-config
-    binary-subdir: bin

config/pkg/tool/zig.yml

@@ -1,14 +0,0 @@
-zig:
-  type: tool
-  artifact:
-    binary: custom
-  tool:
-    provides:
-      - zig
-      - zig-cc
-      - zig-c++
-      - zig-ar
-      - zig-ld.lld
-      - zig-ranlib
-      - zig-objcopy
-    binary-subdir: zig

docs/en/develop/package-model.md

@@ -229,7 +229,7 @@ The following path placeholders are supported in string values of the `path`, `e
 | `{working_dir}` | Working directory (project root) |
 | `{download_path}` | Download cache directory (`downloads/`) |
 | `{source_path}` | Extracted source directory (`source/`) |
-| `{spc_msys2_path}` | MSYS2 root directory (`msys64/`) — Windows only |
+| `{php_sdk_path}` | Windows PHP SDK directory |
 
 ## target Package Type
 

docs/en/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ A single-file hook API for lightweight patches may be provided in a future relea
 
 ### Windows-only: `--with-sdk-binary-dir` and `--vs-ver`
 
-These options are no longer accepted on the command line. In v3, the `php-sdk-binary-tools` dependency has been completely removed. v3 now manages its own **MSYS2** environment to support autotools-based library builds on Windows. Run `spc doctor --install` to download and configure MSYS2 automatically.
+These options are no longer accepted on the command line. Instead, set the `PHP_SDK_PATH` environment variable to point to your PHP SDK binary tools directory. The Visual Studio version is now managed by the toolchain configuration.
-
-If you need to point to a custom MSYS2 installation, set the `SPC_MSYS2_PATH` environment variable to the `msys64` directory (e.g. `C:\msys64`). Visual Studio is now auto-detected by the toolchain — no manual version flag needed.
-
-::: warning Migrating from v2
-v2 relied on `php-sdk-binary-tools` and required `--with-sdk-binary-dir` and `--vs-ver` on every build invocation. In v3 these options are gone. Remove them from all CI scripts and run `spc doctor --install` once to set up the Windows build environment.
-:::
 
 ## Renamed / Deprecated Options
 

docs/zh/develop/package-model.md

@@ -223,7 +223,7 @@ openssl:
 | `{working_dir}` | 工作目录（项目根目录） |
 | `{download_path}` | 下载缓存目录（`downloads/`） |
 | `{source_path}` | 解压源码目录（`source/`） |
-| `{spc_msys2_path}` | MSYS2 根目录（`msys64/`）——仅 Windows |
+| `{php_sdk_path}` | Windows PHP SDK 目录 |
 
 ## target 包类型
 

docs/zh/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ curl -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
 
 ### Windows 专有：`--with-sdk-binary-dir` 和 `--vs-ver`
 
-这两个选项已不再被命令行接受。在 v3 中，`php-sdk-binary-tools` 依赖已被完全移除。v3 现在通过管理自己的 **MSYS2** 环境来支持 Windows 上基于 autotools 的库构建。运行 `spc doctor --install` 即可自动下载并配置 MSYS2。
+这两个选项已不再被命令行接受。请改为设置 `PHP_SDK_PATH` 环境变量，指向你的 PHP SDK binary tools 目录。Visual Studio 版本现在由工具链配置统一管理。
-
-如需指向自定义 MSYS2 安装目录，请设置 `SPC_MSYS2_PATH` 环境变量，值为 `msys64` 目录路径（例如 `C:\msys64`）。Visual Studio 版本现在由工具链自动检测，无需手动指定版本号。
-
-::: warning 从 v2 迁移
-v2 依赖 `php-sdk-binary-tools`，并在每次构建时需要传入 `--with-sdk-binary-dir` 和 `--vs-ver` 参数。在 v3 中这些选项已被移除。请从所有 CI 脚本中删除这些参数，并使用 `spc doctor --install` 一次性完成 Windows 构建环境的配置。
-:::
 
 ## 已重命名 / 已弃用的选项
 

phpstan.neon

@@ -1,6 +1,6 @@
 parameters:
   reportUnmatchedIgnoredErrors: false
-  level: 5
+  level: 4
   phpVersion: 80400
   paths:
     - ./src/

spc.registry.yml

@@ -10,7 +10,6 @@ package:
     - config/pkg/lib/
     - config/pkg/target/
     - config/pkg/ext/
-    - config/pkg/tool/
 artifact:
   config:
     - config/artifact/

src/Package/Artifact/msys2_build_essentials.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\BinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalEnvManager;
-
-class msys2_build_essentials
-{
-    // MSYS subsystem packages required for autotools-based builds.
-    private const REQUIRED_PACKAGES = ['make', 'autoconf', 'automake', 'libtool', 'pkgconf', 'perl', 'bison', 're2c'];
-
-    #[CustomBinary('msys2-build-essentials', ['windows-x86_64'])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        // MSYS2 nightly self-extracting archive; running it with `-y -oTARGET` extracts to TARGET\msys64\.
-        $url = 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.sfx.exe';
-        $filename = 'msys2-base-x86_64-latest.sfx.exe';
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-
-        return DownloadResult::file(
-            $filename,
-            ['url' => $url, 'version' => 'nightly'],
-            version: 'nightly',
-            extract: '{pkg_root_path}/msys2-build-essentials',
-        );
-    }
-
-    #[BinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function extractBinary(string $source_file, string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $source_file = FileSystem::convertPath($source_file);
-
-        // Guard: skip re-extraction if already initialized (marker written at end of this method).
-        $marker = "{$target_path}\\.spc-msys2-initialized";
-        if (file_exists($marker)) {
-            return;
-        }
-
-        if (!is_dir($target_path)) {
-            FileSystem::createDir($target_path);
-        }
-
-        cmd()->exec("\"{$source_file}\" -y -o\"{$target_path}\"");
-
-        $msys2_bin = "{$target_path}\\msys64\\usr\\bin";
-        if (!file_exists("{$msys2_bin}\\bash.exe")) {
-            throw new DownloaderException("MSYS2 extraction failed: bash.exe not found at {$msys2_bin}\\bash.exe");
-        }
-
-        // Add MSYS2 usr\bin to PATH so pacman.exe can load msys-2.0.dll.
-        GlobalEnvManager::addPathIfNotExists($msys2_bin);
-        GlobalEnvManager::putenv('CHERE_INVOKING=yes');
-        GlobalEnvManager::putenv('MSYSTEM=MSYS');
-
-        // Disable PGP signature checking: pacman-key --init requires a pseudo-TTY which is unavailable
-        // from PHP. Patching pacman.conf is the standard approach for CI pipelines.
-        $pacman_conf = "{$target_path}\\msys64\\etc\\pacman.conf";
-        FileSystem::replaceFileRegex($pacman_conf, '/^SigLevel\s*=.*$/m', 'SigLevel = Never');
-
-        $pacman = "{$target_path}\\msys64\\usr\\bin\\pacman.exe";
-
-        // Two-pass update as recommended by MSYS2 CI docs.
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-
-        $pkgs = implode(' ', self::REQUIRED_PACKAGES);
-        cmd()->exec("\"{$pacman}\" --noconfirm -S --needed {$pkgs}");
-
-        FileSystem::writeFile($marker, date('Y-m-d H:i:s'));
-    }
-
-    #[AfterBinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function afterExtract(string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $msys2_root = "{$target_path}\\msys64";
-
-        GlobalEnvManager::putenv("SPC_MSYS2_PATH={$msys2_root}");
-        GlobalEnvManager::addPathIfNotExists("{$msys2_root}\\usr\\bin");
-    }
-}

src/Package/Extension/gmssl.php

@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Extension;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Util\FileSystem;
-
-#[Extension('gmssl')]
-class gmssl extends PhpExtensionPackage
-{
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1 compatibility with GmSSL >= 3.1.0 where SM2_VERIFY_CTX was removed (unified into SM2_SIGN_CTX)')]
-    public function patchSm2VerifyCtx(): void
-    {
-        // See: https://github.com/crazywhalecc/static-php-cli/issues/1182
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'SM2_VERIFY_CTX',
-            'SM2_SIGN_CTX'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1: pbkdf2_hmac_sm3_genkey was renamed to sm3_pbkdf2 in GmSSL >= 3.2.0')]
-    public function patchPbkdf2Rename(): void
-    {
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'pbkdf2_hmac_sm3_genkey',
-            'sm3_pbkdf2'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Add CHECK_LIB to config.w32 for static Windows builds')]
-    public function patchBeforeBuildconfWin(): bool
-    {
-        $configW32 = "{$this->getSourceDir()}/config.w32";
-        if (str_contains(FileSystem::readFile($configW32), 'CHECK_LIB(')) {
-            return false;
-        }
-        FileSystem::replaceFileStr(
-            $configW32,
-            'AC_DEFINE(',
-            'CHECK_LIB("gmssl.lib", "gmssl", PHP_GMSSL);' . PHP_EOL . 'AC_DEFINE('
-        );
-        return true;
-    }
-}

src/Package/Extension/imagick.php

@@ -4,12 +4,17 @@ declare(strict_types=1);
 
 namespace Package\Extension;
 
+use Package\Target\php;
+use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\CustomPhpConfigureArg;
 use StaticPHP\Attribute\Package\Extension;
+use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageBuilder;
+use StaticPHP\Package\PhpExtensionPackage;
+use StaticPHP\Util\FileSystem;
 
 #[Extension('imagick')]
-class imagick
+class imagick extends PhpExtensionPackage
 {
     #[CustomPhpConfigureArg('Darwin')]
     #[CustomPhpConfigureArg('Linux')]
@@ -18,4 +23,35 @@ class imagick
         $disable_omp = ' ac_cv_func_omp_pause_resource_all=no';
         return '--with-imagick=' . ($shared ? 'shared,' : '') . $builder->getBuildRootPath() . $disable_omp;
     }
+
+    #[CustomPhpConfigureArg('Windows')]
+    public function getWindowsConfigureArg(bool $shared): string
+    {
+        // config.w32 uses PHP_IMAGICK as an extra search path for CORE_RL_*.lib; the static
+        // ImageMagick libs are installed flat in buildroot/lib (headers in buildroot/include/imagemagick).
+        return '--with-imagick=' . BUILD_LIB_PATH;
+    }
+
+    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-imagick')]
+    #[PatchDescription('Add the Win32 system libraries the static ImageMagick stack needs')]
+    public function patchConfigW32ForWindows(): void
+    {
+        $config = $this->getSourceDir() . '/config.w32';
+
+        // Idempotency guard (the source dir may be patched in place and reused across builds).
+        if (str_contains(FileSystem::readFile($config), 'LIBS_IMAGICK')) {
+            return;
+        }
+
+        // The static ImageMagick stack needs several Win32 system libraries (GDI+, WIC, urlmon, ...)
+        // that aren't already pulled in by the other extensions. (imagick itself builds as plain C:
+        // ImageMagick is built with a 32-bit channel mask, see imagemagick.php buildWin, so the
+        // MagickCore headers don't require a C++ translation unit.)
+        FileSystem::replaceFileStr(
+            $config,
+            "AC_DEFINE('HAVE_IMAGICK', 1);",
+            'ADD_FLAG("LIBS_IMAGICK", "gdiplus.lib urlmon.lib msimg32.lib oleaut32.lib windowscodecs.lib iphlpapi.lib");' . "\n\t\t" .
+            "AC_DEFINE('HAVE_IMAGICK', 1);"
+        );
+    }
 }

src/Package/Extension/simdjson.php

@@ -50,7 +50,6 @@ class simdjson extends PhpExtensionPackage
             if (!str_contains((string) $extra, '-lstdc++')) {
                 f_putenv('SPC_COMPILER_EXTRA=' . clean_spaces($extra . ' -lstdc++'));
             }
-
             $env['CFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
             $env['CXXFLAGS'] .= ' -Xclang -target-feature -Xclang +evex512';
         }

src/Package/Extension/xlswriter.php

@@ -32,15 +32,12 @@ class xlswriter extends PhpExtensionPackage
     #[PatchDescription('Fix Windows build: apply win32 patch and add UTF-8 BOM to theme.c')]
     public function patchBeforeMakeForWindows(): void
     {
-        $source_dir = $this->getSourceDir();
-        $theme_file = "{$source_dir}/library/libxlsx/src/theme.c";
-
         // fix windows build with openssl extension duplicate symbol bug
-        SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $source_dir);
+        SourcePatcher::patchFile('spc_fix_xlswriter_win32.patch', $this->getSourceDir());
-        $content = file_get_contents($theme_file);
+        $content = file_get_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c');
         $bom = pack('CCC', 0xEF, 0xBB, 0xBF);
         if (!str_starts_with($content, $bom)) {
-            file_put_contents($theme_file, $bom . $content);
+            file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content);
         }
     }
 }

src/Package/Library/gmssl.php

@@ -18,9 +18,7 @@ class gmssl
     #[BuildFor('Darwin')]
     public function build(LibraryPackage $lib): void
     {
-        UnixCMakeExecutor::create($lib)
+        UnixCMakeExecutor::create($lib)->build();
-            ->addConfigureArgs('-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON')
-            ->build();
     }
 
     #[BuildFor('Windows')]
@@ -35,7 +33,6 @@ class gmssl
                 '-G "NMake Makefiles"',
                 '-DWIN32=ON',
                 '-DBUILD_SHARED_LIBS=OFF',
-                '-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON',
                 '-DCMAKE_BUILD_TYPE=Release',
                 '-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
                 '-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
@@ -45,13 +42,13 @@ class gmssl
             ->toStep(1)
             ->build();
 
-        cmd()->cd($buildDir)->exec('nmake gmssl XCFLAGS=/MT');
+        // fix cmake_install.cmake install prefix (GmSSL overrides it internally)
+        $installCmake = "{$buildDir}\\cmake_install.cmake";
+        FileSystem::writeFile(
+            $installCmake,
+            'set(CMAKE_INSTALL_PREFIX "' . str_replace('\\', '/', $lib->getBuildRootPath()) . '")' . PHP_EOL . FileSystem::readFile($installCmake)
+        );
 
-        $libPath = "{$lib->getBuildRootPath()}/lib";
+        cmd()->cd($buildDir)->exec('nmake install XCFLAGS=/MT');
-        $incPath = "{$lib->getBuildRootPath()}/include/gmssl";
-        FileSystem::createDir($libPath);
-        FileSystem::createDir($incPath);
-        FileSystem::copy("{$buildDir}\\bin\\gmssl.lib", "{$libPath}/gmssl.lib");
-        FileSystem::copyDir("{$lib->getSourceDir()}\\include\\gmssl", $incPath);
     }
 }

src/Package/Library/imagemagick.php

@@ -6,6 +6,7 @@ namespace Package\Library;
 
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Library;
+use StaticPHP\Exception\EnvironmentException;
 use StaticPHP\Package\LibraryPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Runtime\SystemTarget;
@@ -15,6 +16,67 @@ use StaticPHP\Util\FileSystem;
 #[Library('imagemagick')]
 class imagemagick
 {
+    /**
+     * Build a fully static, self-contained ImageMagick 7 (Q16-HDRI, /MT) on Windows using the
+     * official VisualMagick build (the ImageMagick/Windows + Configure + Dependencies repos), which
+     * bundles every delegate. ImageMagick has no autoconf/CMake build on Windows, so this clones the
+     * VisualMagick tree, generates a static x64 solution via the Configure tool, and builds it with
+     * msbuild. The resulting CORE_RL_*.lib static libraries + MagickWand/MagickCore headers are
+     * installed into the build root for ext-imagick to link.
+     *
+     * A short working directory is used (VisualMagick's tree is deeply nested and otherwise exceeds
+     * MAX_PATH); override with SPC_IMAGEMAGICK_BUILD_DIR.
+     */
+    #[BuildFor('Windows')]
+    public function buildWin(LibraryPackage $lib): void
+    {
+        $work = getenv('SPC_IMAGEMAGICK_BUILD_DIR') ?: 'C:\im';
+        $configure_release = '2026.05.30.2033';
+        $configure_url = "https://github.com/ImageMagick/Configure/releases/download/{$configure_release}/Configure.Release.x64.exe";
+
+        FileSystem::createDir($work);
+        // Clone the VisualMagick repos (ImageMagick source + Configure + Dependencies + all delegates).
+        if (!is_dir("{$work}\\ImageMagick")) {
+            cmd()->cd($work)->exec(SPC_GIT_EXEC . ' clone --depth 1 https://github.com/ImageMagick/Windows.git .');
+            cmd()->cd($work)->exec('bash clone-repositories.sh --imagemagick7');
+        }
+        // Use the prebuilt Configure tool (building it from source needs the MFC components).
+        default_shell()->executeCurlDownload($configure_url, "{$work}\\Configure\\Configure.Release.x64.exe", retries: 2);
+
+        // Generate a static, /MT (linkRuntime), x64, Q16-HDRI solution with the configs embedded
+        // (zeroConfigurationSupport) and OpenMP off (no vcomp runtime dependency).
+        cmd()->cd("{$work}\\Configure")
+            ->exec('Configure.Release.x64.exe /noWizard /VS2026 /x64 /static /linkRuntime /noOpenMP /zeroConfigurationSupport');
+
+        // x64 IM7 defaults to a 64-bit channel mask, whose magick-baseconfig.h #errors unless the
+        // consuming translation unit is C++. ext-imagick is plain C, so force a 32-bit channel mask
+        // (ample: 32 channels >> RGBA/CMYK) before building, keeping libs and the installed header in sync.
+        FileSystem::replaceFileStr(
+            "{$work}\\ImageMagick\\MagickCore\\magick-baseconfig.h",
+            '#define MAGICKCORE_CHANNEL_MASK_DEPTH 64',
+            '#define MAGICKCORE_CHANNEL_MASK_DEPTH 32'
+        );
+
+        cmd()->cd($work)
+            ->exec('msbuild IM7.Static.x64.sln /m /t:Rebuild /nologo /p:Configuration=Release,Platform=x64');
+
+        $artifacts = "{$work}\\Artifacts\\lib";
+        if (!is_dir($artifacts)) {
+            throw new EnvironmentException('ImageMagick VisualMagick build produced no Artifacts/lib; build failed.');
+        }
+        // Install the static libs (flat, onto the build-root lib path) and the public headers.
+        FileSystem::createDir($lib->getLibDir());
+        foreach (glob("{$artifacts}\\CORE_RL_*.lib") as $f) {
+            FileSystem::copy($f, $lib->getLibDir() . '\\' . basename($f));
+        }
+        foreach (['MagickWand', 'MagickCore'] as $dir) {
+            FileSystem::createDir($lib->getIncludeDir() . "\\imagemagick\\{$dir}");
+            foreach (glob("{$work}\\ImageMagick\\{$dir}\\*.h") as $h) {
+                FileSystem::copy($h, $lib->getIncludeDir() . "\\imagemagick\\{$dir}\\" . basename($h));
+            }
+        }
+    }
+
     #[BuildFor('Darwin')]
     #[BuildFor('Linux')]
     public function buildUnix(LibraryPackage $lib, ToolchainInterface $toolchain): void

src/Package/Library/libde265.php

@@ -20,7 +20,6 @@ class libde265 extends LibraryPackage
             ->addConfigureArgs(
                 '-DENABLE_SDL=OFF',
                 '-DENABLE_DECODER=OFF',
-                '-DENABLE_SIMD=OFF',
                 '-DHAVE_NEON=OFF',
             )
             ->build();

src/Package/Library/libssh2.php

@@ -18,7 +18,6 @@ class libssh2
     {
         WindowsCMakeExecutor::create($lib)
             ->addConfigureArgs(
-                '-DCRYPTO_BACKEND=WinCNG',
                 '-DENABLE_ZLIB_COMPRESSION=ON',
                 '-DBUILD_TESTING=OFF'
             )

src/Package/Library/openssl.php

@@ -24,7 +24,7 @@ class openssl
     {
         if (SystemTarget::getTargetOS() === 'Windows') {
             global $argv;
-            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe';
+            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl-' . arch2gnu(php_uname('m')) . '-win\perl\bin\perl.exe';
             $perl = file_exists($perl_path_native) ? ($perl_path_native) : WindowsUtil::findCommand('perl.exe');
             if ($perl === null) {
                 throw new EnvironmentException(

src/Package/Library/postgresql.php

@@ -37,6 +37,10 @@ class postgresql extends LibraryPackage
     #[PatchDescription('Various patches before building PostgreSQL')]
     public function patchBeforeBuild(): bool
     {
+        // These patches target the autoconf/Make build; the Windows build uses Meson (see buildWin).
+        if (SystemTarget::getTargetOS() === 'Windows') {
+            return true;
+        }
         // skip the test on platforms where libpq infrastructure may be provided by statically-linked libraries
         FileSystem::replaceFileStr("{$this->getSourceDir()}/src/interfaces/libpq/Makefile", 'invokes exit\'; exit 1;', 'invokes exit\';');
         // disable shared libs build
@@ -53,6 +57,72 @@ class postgresql extends LibraryPackage
         return true;
     }
 
+    #[BuildFor('Windows')]
+    public function buildWin(LibraryPackage $lib): void
+    {
+        $src = $lib->getSourceDir();
+        $build_root = $lib->getBuildRootPath();
+        $lib_dir = $lib->getLibDir();
+        $inc_dir = $lib->getIncludeDir();
+        $build = "{$src}\\build";
+
+        // Export the public pg_char_to_encoding()/pg_encoding_to_char() from libpgcommon.a so a
+        // statically-linked libpq.a resolves them (PHP's ext/pgsql relies on them too). This mirrors
+        // the Unix build's -UUSE_PRIVATE_ENCODING_FUNCS patch, but for the Meson build.
+        FileSystem::replaceFileStr(
+            "{$src}\\src\\common\\meson.build",
+            "'c_args': ['-DUSE_PRIVATE_ENCODING_FUNCS'],",
+            "'c_args': [],"
+        );
+
+        // Fresh Meson build dir (Meson refuses to reuse a dir configured differently).
+        if (is_dir($build)) {
+            FileSystem::removeDir($build);
+        }
+
+        // Meson's OpenSSL detection link-tests CRYPTO_new_ex_data; our static libcrypto needs its
+        // Win32 deps (and zlib, since OpenSSL was built with zlib) on the link line to succeed.
+        $ld = 'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib secur32.lib zlibstatic.lib';
+
+        $configure = 'meson setup build'
+            . ' --prefix=' . escapeshellarg($build_root)
+            . ' -Ddefault_library=static'   // static libpq.a / libpgcommon.a / libpgport.a
+            . ' -Db_vscrt=mt'               // /MT static CRT, matching the rest of the build
+            . ' -Dssl=openssl'
+            // Everything libpq doesn't need: keeps deps minimal and avoids server-only detection.
+            . ' -Dzlib=disabled -Dnls=disabled -Dreadline=disabled -Dicu=disabled'
+            . ' -Dlz4=disabled -Dzstd=disabled -Dtap_tests=disabled'
+            . ' -Dplperl=disabled -Dplpython=disabled -Dpltcl=disabled'
+            . ' -Dgssapi=disabled -Dldap=disabled -Dlibxml=disabled -Dlibxslt=disabled'
+            . ' -Dextra_include_dirs=' . escapeshellarg("{$build_root}\\include")
+            . ' -Dextra_lib_dirs=' . escapeshellarg($lib_dir);
+
+        // Build only the three frontend static libs (not the server) — keeps it fast and avoids
+        // needing every backend dependency. meson/ninja/win_bison/win_flex/perl come from PATH.
+        $targets = 'src/interfaces/libpq/libpq.a src/common/libpgcommon.a src/port/libpgport.a';
+
+        cmd()->cd($src)
+            ->setEnv([
+                'LIB' => $lib_dir . ';' . (getenv('LIB') ?: ''),
+                'LDFLAGS' => $ld,
+            ])
+            ->exec($configure)
+            ->exec("ninja -C build {$targets}");
+
+        // Install the static libs under the names PHP's ext/pgsql + frankenphp expect (.lib).
+        FileSystem::createDir($lib_dir);
+        FileSystem::createDir($inc_dir);
+        FileSystem::copy("{$build}\\src\\interfaces\\libpq\\libpq.a", "{$lib_dir}\\libpq.lib");
+        FileSystem::copy("{$build}\\src\\common\\libpgcommon.a", "{$lib_dir}\\libpgcommon.lib");
+        FileSystem::copy("{$build}\\src\\port\\libpgport.a", "{$lib_dir}\\libpgport.lib");
+
+        // Install the public libpq headers (PG18 no longer ships pg_config_ext.h).
+        FileSystem::copy("{$src}\\src\\interfaces\\libpq\\libpq-fe.h", "{$inc_dir}\\libpq-fe.h");
+        FileSystem::copy("{$src}\\src\\include\\postgres_ext.h", "{$inc_dir}\\postgres_ext.h");
+        FileSystem::createDir("{$inc_dir}\\libpq");
+        FileSystem::copy("{$src}\\src\\include\\libpq\\libpq-fs.h", "{$inc_dir}\\libpq\\libpq-fs.h");
+    }
+
     #[BuildFor('Darwin')]
     #[BuildFor('Linux')]
     public function buildUnix(PackageInstaller $installer, PackageBuilder $builder): void

src/Package/Target/curl.php

@@ -35,12 +35,22 @@ class curl
     #[BuildFor('Windows')]
     public function buildWin(LibraryPackage $lib): void
     {
+        $lib_dir = str_replace('\\', '/', $lib->getLibDir());
+        // Pass zstd's import library by absolute path. A bare name ("zstd_static.lib") lands on the
+        // link line unresolved and MSVC looks for it relative to the curl build dir (LNK1181).
+        $zstd_lib = "{$lib_dir}/zstd_static.lib";
+        // libssh2 uses the OpenSSL crypto backend, but this curl build links Schannel and never
+        // find_package(OpenSSL), so libcrypto/libssl are absent from the link line and libssh2's
+        // EVP_*/RAND/PEM/ERR symbols go unresolved. Append them (plus the Win32 libs OpenSSL needs,
+        // mirroring openssl.php) to every target. MSVC's linker resolves regardless of order.
+        $extra_libs = "{$lib_dir}/libcrypto.lib {$lib_dir}/libssl.lib ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib";
         WindowsCMakeExecutor::create($lib)
             ->optionalPackage('zstd', ...cmake_boolean_args('CURL_ZSTD'))
             ->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=ON',
-                '-DZSTD_LIBRARY=' . BUILD_LIB_PATH . '/zstd_static.lib',
+                '-DCMAKE_C_STANDARD_LIBRARIES=' . escapeshellarg($extra_libs),
+                '-DZSTD_LIBRARY=' . escapeshellarg($zstd_lib),
                 '-DBUILD_TESTING=OFF',
                 '-DBUILD_EXAMPLES=OFF',
                 '-DUSE_LIBIDN2=OFF',

src/Package/Target/php.php

@@ -255,13 +255,6 @@ class php extends TargetPackage
             $installer->addBuildPackage('php-embed');
         }
 
-        // UPX compression: ensure the upx tool package is installed when requested.
-        // upx is a ToolPackage now, so it's installed directly rather than added as a
-        // library dependency (tool packages bypass the DependencyResolver graph).
-        if ($package->getBuildOption('with-upx-pack')) {
-            $installer->addInstallPackage('upx');
-        }
-
         return [...$extensions_pkg, ...$additional_packages];
     }
 

src/Package/Target/php/frankenphp.php

@@ -233,10 +233,21 @@ trait frankenphp
         $dep_libs = array_unique($dep_libs);
         $lib_dir = str_replace('\\', '/', BUILD_LIB_PATH);
         $php_embed_lib = "-lphp{$major}embed";
-        $win_sys_libs = '-lkernel32 -lole32 -luser32 -ladvapi32 -lshell32 -lws2_32 -ldnsapi -lpsapi -lbcrypt';
+        // pathcch: PathCchCanonicalizeEx etc. used by frankenphp/caddy path handling.
+        // secur32: InitSecurityInterfaceA (curl Schannel/SSPI). crypt32/gdi32: OpenSSL + Schannel.
+        $win_sys_libs = '-lkernel32 -lole32 -luser32 -ladvapi32 -lshell32 -lws2_32 -ldnsapi -lpsapi -lbcrypt -lpathcch -lsecur32 -lcrypt32 -lgdi32';
         $cgo_ldflags = clean_spaces(implode(' ', array_filter([
             "-L{$lib_dir}",
             $php_embed_lib,
+            // FrankenPHP's cgo code references PHP/lexbor/zend symbols via __declspec(dllimport).
+            // Their definitions live in php{N}embed.lib but are only pulled in if the plain symbol
+            // is referenced, so the __imp_ refs go unresolved. Force-include one symbol from each
+            // defining object (zend_atomic.obj, lexbor url.obj, lexbor idna.obj) to pull them in;
+            // lld then auto-imports the __imp_ refs. (/WHOLEARCHIVE would also drag in libxml2.res,
+            // which collides with Go's own resource object: "more than one resource obj file".)
+            '-Wl,/INCLUDE:zend_atomic_bool_store',
+            '-Wl,/INCLUDE:lxb_url_parse',
+            '-Wl,/INCLUDE:lxb_unicode_idna_init',
             implode(' ', $dep_libs),
             $win_sys_libs,
             '-llibcmt',

src/Package/Target/php/windows.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Package\Target\php;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\Stage;
@@ -39,13 +40,6 @@ trait windows
         InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('./buildconf.bat'));
         cmd()->cd($package->getSourceDir())->exec('.\buildconf.bat');
 
-        // Bypass the phpsdk_version check in configure.js: we use MSVC + msys2 instead of PHP SDK, so phpsdk_version is not available and the check would always fail.
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\configure.js",
-            'check_binary_tools_sdk();',
-            '/* check_binary_tools_sdk(); skipped: using MSVC + msys2 without PHP SDK */'
-        );
-
         if ($package->getBuildOption('enable-micro-win32') && $installer->isPackageResolved('php-micro')) {
             SourcePatcher::patchMicroWin32();
         } else {
@@ -95,17 +89,6 @@ trait windows
         cmd()->cd($package->getSourceDir())->exec(".\\configure.bat {$args} {$static_extension_str}");
     }
 
-    #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
-    #[PatchDescription('Patch Makefile to ensure buildroot/include comes before extension CFLAGS (fixes zip.h conflict with minizip)')]
-    public function patchMakefileIncludeOrder(TargetPackage $package): void
-    {
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\Makefile",
-            '$(CFLAGS_PHP_OBJ) $(CFLAGS)',
-            '$(CFLAGS) $(CFLAGS_PHP_OBJ)'
-        );
-    }
-
     #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
     #[PatchDescription('Patch Windows Makefile for CLI target')]
     public function patchCLITarget(TargetPackage $package): void
@@ -126,7 +109,10 @@ trait windows
             throw new PatchException('Windows Makefile patching for php.exe target', 'Cannot patch windows CLI Makefile, Makefile does not contain "$(BUILD_DIR)\php.exe:" line');
         }
         $lines[$line_num] = '$(BUILD_DIR)\php.exe: generated_files $(DEPS_CLI) $(PHP_GLOBAL_OBJS) $(CLI_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(ASM_OBJS) $(BUILD_DIR)\php.exe.res $(BUILD_DIR)\php.exe.manifest';
-        $lines[$line_num + 1] = "\t" . '"$(LINK)" /nologo $(PHP_GLOBAL_OBJS_RESP) $(CLI_GLOBAL_OBJS_RESP) $(STATIC_EXT_OBJS_RESP) $(STATIC_EXT_LIBS) $(ASM_OBJS) $(LIBS) $(LIBS_CLI) $(BUILD_DIR)\php.exe.res /out:$(BUILD_DIR)\php.exe $(LDFLAGS) $(LDFLAGS_CLI) /ltcg /nodefaultlib:msvcrt /nodefaultlib:msvcrtd /ignore:4286';
+        // /FORCE:MULTIPLE: extensions may bundle their own static copies of common libraries (e.g.
+        // imagick's ImageMagick ships its own zlib/png/jpeg, duplicating gd's); let the first
+        // definition win instead of failing with LNK2005. /ignore:4006 silences the resulting noise.
+        $lines[$line_num + 1] = "\t" . '"$(LINK)" /nologo $(PHP_GLOBAL_OBJS_RESP) $(CLI_GLOBAL_OBJS_RESP) $(STATIC_EXT_OBJS_RESP) $(STATIC_EXT_LIBS) $(ASM_OBJS) $(LIBS) $(LIBS_CLI) $(BUILD_DIR)\php.exe.res /out:$(BUILD_DIR)\php.exe $(LDFLAGS) $(LDFLAGS_CLI) /ltcg /nodefaultlib:msvcrt /nodefaultlib:msvcrtd /ignore:4286 /FORCE:MULTIPLE /ignore:4006';
         FileSystem::writeFile("{$package->getSourceDir()}\\Makefile", implode("\r\n", $lines));
     }
 
@@ -714,12 +700,18 @@ C_CODE;
         // MSVC cl.exe format: compiler flags must come before /link, linker flags after
         // ldflags contains /LIBPATH which must be after /link
         // /FORCE:MULTIPLE: in ZTS mode both zend.obj and php_embed.obj (both packed into the fat php8embed.lib) define _tsrm_ls_cache as a __declspec(thread) variable.
+        // /INCLUDE: php8embed.lib's ext/uri (uri_parser_whatwg.obj) references lexbor lxb_url_*/
+        // lxb_unicode_idna_* via __declspec(dllimport); their definitions live in url.obj/idna.obj
+        // but are only pulled in if the plain symbol is referenced. Force-include one symbol from
+        // each so the objects are linked and the __imp_ refs auto-import. (FrankenPHP needs the same.)
+        // System libs add pathcch (PathCchCanonicalizeEx), secur32 (curl Schannel InitSecurityInterface),
+        // crypt32/gdi32 (OpenSSL + Schannel) on top of the Makefile LIBS set.
         $compile_cmd = sprintf(
-            'cl.exe /nologo /O2 /MT /Z7 %s embed.c /Fe:embed.exe /link /FORCE:MULTIPLE /LIBPATH:"%s\lib" %s %s',
+            'cl.exe /nologo /O2 /MT /Z7 %s embed.c /Fe:embed.exe /link /FORCE:MULTIPLE /INCLUDE:lxb_url_parse /INCLUDE:lxb_unicode_idna_init /LIBPATH:"%s\lib" %s %s',
             $include_flags,
             BUILD_ROOT_PATH,
             $config['libs'],
-            'kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib dnsapi.lib psapi.lib bcrypt.lib'  // Windows system libs (match Makefile LIBS)
+            'kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib dnsapi.lib psapi.lib bcrypt.lib pathcch.lib secur32.lib crypt32.lib gdi32.lib'  // Windows system libs (match Makefile LIBS) + curl/openssl deps
         );
 
         // Log command explicitly (workaround for cmd() not logging complex commands properly)
@@ -733,9 +725,11 @@ C_CODE;
             );
         }
 
-        // Run the embed test
+        // Run the embed test. Use a ".\" prefix: cmd.exe does not resolve a bare "embed.exe" from
+        // the current directory, while the cwd must remain $test_dir so the script's relative
+        // "embed.php" is found.
         InteractiveTerm::setMessage('Running php-embed run smoke test');
-        [$ret, $output] = cmd()->cd($test_dir)->execWithResult('embed.exe');
+        [$ret, $output] = cmd()->cd($test_dir)->execWithResult('.\embed.exe');
         $raw_output = implode('', $output);
         if ($ret !== 0 || trim($raw_output) !== 'hello') {
             throw new ValidationException(

src/Package/Target/pkgconfig.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace Package\Tool;
+namespace Package\Target;
 
 use StaticPHP\Attribute\Package\BuildFor;
 use StaticPHP\Attribute\Package\InitPackage;
-use StaticPHP\Attribute\Package\Tool;
+use StaticPHP\Attribute\Package\Target;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Package\ToolPackage;
+use StaticPHP\Package\TargetPackage;
 use StaticPHP\Runtime\Executor\UnixAutoconfExecutor;
 use StaticPHP\Toolchain\Interface\ToolchainInterface;
 
-#[Tool('pkg-config')]
+#[Target('pkg-config')]
 class pkgconfig
 {
     #[InitPackage]
@@ -23,7 +23,7 @@ class pkgconfig
 
     #[BuildFor('Linux')]
     #[BuildFor('Darwin')]
-    public function build(ToolPackage $package, ToolchainInterface $toolchain): void
+    public function build(TargetPackage $package, ToolchainInterface $toolchain): void
     {
         UnixAutoconfExecutor::create($package)
             ->appendEnv([

src/StaticPHP/Artifact/Artifact.php

@@ -644,7 +644,7 @@ class Artifact
             '{artifact_name}' => $this->name,
             '{pkg_root_path}' => PKG_ROOT_PATH,
             '{build_root_path}' => BUILD_ROOT_PATH,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH'),
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: WORKING_DIR . '/php-sdk-binary-tools',
             '{working_dir}' => WORKING_DIR,
             '{download_path}' => DOWNLOAD_PATH,
             '{source_path}' => SOURCE_PATH,

src/StaticPHP/Artifact/ArtifactDownloader.php

@@ -26,7 +26,6 @@ use StaticPHP\Exception\DownloaderException;
 use StaticPHP\Exception\ExecutionException;
 use StaticPHP\Exception\ValidationException;
 use StaticPHP\Exception\WrongUsageException;
-use StaticPHP\Package\ToolVersionRegistry;
 use StaticPHP\Registry\ArtifactLoader;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
@@ -347,32 +346,12 @@ class ArtifactDownloader
         }
     }
 
-    public function checkUpdate(string $artifact_name, bool $prefer_source = false, bool $bare = false, bool $use_installed = false): CheckUpdateResult
+    public function checkUpdate(string $artifact_name, bool $prefer_source = false, bool $bare = false): CheckUpdateResult
     {
         $artifact = ArtifactLoader::getArtifactInstance($artifact_name);
         if ($artifact === null) {
             throw new WrongUsageException("Artifact '{$artifact_name}' not found, please check the name.");
         }
-
-        // --installed: prefer the version actually installed on disk (tool packages only) as the
-        // baseline, instead of the download cache. Falls back to the normal cache/bare logic below
-        // if this artifact has no recorded installed version (not a tool package, or not installed
-        // via the package installer yet).
-        if ($use_installed) {
-            $installed_version = ToolVersionRegistry::get($artifact_name);
-            if ($installed_version !== null) {
-                [$first, $second] = $prefer_source
-                    ? [fn () => $this->probeSourceCheckUpdate($artifact, $artifact_name, $installed_version), fn () => $this->probeBinaryCheckUpdate($artifact, $artifact_name, $installed_version)]
-                    : [fn () => $this->probeBinaryCheckUpdate($artifact, $artifact_name, $installed_version), fn () => $this->probeSourceCheckUpdate($artifact, $artifact_name, $installed_version)];
-                $result = $first() ?? $second();
-                if ($result !== null) {
-                    return $result;
-                }
-                return new CheckUpdateResult(old: $installed_version, new: null, needUpdate: false, unsupported: true);
-            }
-            logger()->warning("Artifact '{$artifact_name}' has no recorded installed version (not a tool package, or not installed yet); falling back to download-cache based check.");
-        }
-
         if ($bare) {
             [$first, $second] = $prefer_source
                 ? [fn () => $this->probeSourceCheckUpdate($artifact, $artifact_name), fn () => $this->probeBinaryCheckUpdate($artifact, $artifact_name)]
@@ -424,17 +403,16 @@ class ArtifactDownloader
      * @param  bool                             $prefer_source  Whether to prefer source over binary
      * @param  bool                             $bare           Check without requiring artifact to be downloaded first
      * @param  null|callable                    $onResult       Called immediately with (string $name, CheckUpdateResult) as each result arrives
-     * @param  bool                             $use_installed  Prefer the installed (on-disk) version over the download cache (tool packages only)
      * @return array<string, CheckUpdateResult> Results keyed by artifact name
      */
-    public function checkUpdates(array $artifact_names, bool $prefer_source = false, bool $bare = false, ?callable $onResult = null, bool $use_installed = false): array
+    public function checkUpdates(array $artifact_names, bool $prefer_source = false, bool $bare = false, ?callable $onResult = null): array
     {
         if ($this->parallel > 1 && count($artifact_names) > 1) {
-            return $this->checkUpdatesWithConcurrency($artifact_names, $prefer_source, $bare, $onResult, $use_installed);
+            return $this->checkUpdatesWithConcurrency($artifact_names, $prefer_source, $bare, $onResult);
         }
         $results = [];
         foreach ($artifact_names as $name) {
-            $result = $this->checkUpdate($name, $prefer_source, $bare, $use_installed);
+            $result = $this->checkUpdate($name, $prefer_source, $bare);
             $results[$name] = $result;
             if ($onResult !== null) {
                 ($onResult)($name, $result);
@@ -458,7 +436,7 @@ class ArtifactDownloader
         return $this->options[$name] ?? $default;
     }
 
-    private function checkUpdatesWithConcurrency(array $artifact_names, bool $prefer_source, bool $bare, ?callable $onResult, bool $use_installed = false): array
+    private function checkUpdatesWithConcurrency(array $artifact_names, bool $prefer_source, bool $bare, ?callable $onResult): array
     {
         $results = [];
         $fiber_pool = [];
@@ -473,8 +451,8 @@ class ArtifactDownloader
                 // fill pool
                 while (count($fiber_pool) < $this->parallel && !empty($remaining)) {
                     $name = array_shift($remaining);
-                    $fiber = new \Fiber(function () use ($name, $prefer_source, $bare, $use_installed) {
+                    $fiber = new \Fiber(function () use ($name, $prefer_source, $bare) {
-                        return [$name, $this->checkUpdate($name, $prefer_source, $bare, $use_installed)];
+                        return [$name, $this->checkUpdate($name, $prefer_source, $bare)];
                     });
                     $fiber->start();
                     $fiber_pool[$name] = $fiber;
@@ -513,12 +491,12 @@ class ArtifactDownloader
         return $results;
     }
 
-    private function probeSourceCheckUpdate(Artifact $artifact, string $artifact_name, ?string $old_version = null): ?CheckUpdateResult
+    private function probeSourceCheckUpdate(Artifact $artifact, string $artifact_name): ?CheckUpdateResult
     {
         if (($callback = $artifact->getCustomSourceCheckUpdateCallback()) !== null) {
             return ApplicationContext::invoke($callback, [
                 ArtifactDownloader::class => $this,
-                'old_version' => $old_version,
+                'old_version' => null,
             ]);
         }
         $config = $artifact->getDownloadConfig('source');
@@ -531,16 +509,16 @@ class ArtifactDownloader
         }
         /** @var CheckUpdateInterface $dl */
         $dl = new $cls();
-        return $dl->checkUpdate($artifact_name, $config, $old_version, $this);
+        return $dl->checkUpdate($artifact_name, $config, null, $this);
     }
 
-    private function probeBinaryCheckUpdate(Artifact $artifact, string $artifact_name, ?string $old_version = null): ?CheckUpdateResult
+    private function probeBinaryCheckUpdate(Artifact $artifact, string $artifact_name): ?CheckUpdateResult
     {
         // custom binary callback takes precedence over config-based binary
         if (($callback = $artifact->getCustomBinaryCheckUpdateCallback()) !== null) {
             return ApplicationContext::invoke($callback, [
                 ArtifactDownloader::class => $this,
-                'old_version' => $old_version,
+                'old_version' => null,
             ]);
         }
         $binary_config = $artifact->getDownloadConfig('binary');
@@ -554,7 +532,7 @@ class ArtifactDownloader
         }
         /** @var CheckUpdateInterface $dl */
         $dl = new $cls();
-        return $dl->checkUpdate($artifact_name, $platform_config, $old_version, $this);
+        return $dl->checkUpdate($artifact_name, $platform_config, null, $this);
     }
 
     private function downloadWithType(Artifact $artifact, int $current, int $total, bool $parallel = false): int

src/StaticPHP/Artifact/ArtifactExtractor.php

@@ -614,7 +614,7 @@ class ArtifactExtractor
             '{source_path}' => SOURCE_PATH,
             '{download_path}' => DOWNLOAD_PATH,
             '{working_dir}' => WORKING_DIR,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH') ?: '',
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: '',
         ];
         return str_replace(array_keys($replacement), array_values($replacement), $path);
     }

src/StaticPHP/Artifact/Downloader/DownloadResult.php

@@ -76,10 +76,9 @@ class DownloadResult
         ?string $version = null,
         array $metadata = [],
         ?string $downloader = null,
-        mixed $extract = null,
     ): DownloadResult {
         $cache_type = self::isArchiveFile($filename) ? 'archive' : 'file';
-        return new self($cache_type, config: $config, filename: $filename, extract: $extract, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
+        return new self($cache_type, config: $config, filename: $filename, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
     }
 
     /**

src/StaticPHP/Artifact/Downloader/Type/FileList.php

@@ -45,11 +45,7 @@ class FileList implements DownloadTypeInterface, CheckUpdateInterface
             throw new DownloaderException("Failed to get {$name} file list from {$config['url']}");
         }
         $versions = [];
-        $cnt = count($matches['version']);
+        logger()->debug('Matched ' . count($matches['version']) . " versions for {$name}");
-        if ($cnt === 0) {
-            throw new DownloaderException("Failed to get {$name} file list from {$config['url']}: no version parsed");
-        }
-        logger()->debug("Matched {$cnt} versions for {$name}");
         foreach ($matches['version'] as $i => $version) {
             $lower = strtolower($version);
             foreach (['alpha', 'beta', 'rc', 'pre', 'nightly', 'snapshot', 'dev'] as $beta) {

src/StaticPHP/Attribute/Package/Tool.php

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Attribute\Package;
-
-/**
- * Indicates that the annotated class defines a tool package.
- */
-#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
-readonly class Tool
-{
-    public function __construct(public string $name) {}
-}

src/StaticPHP/Command/BaseCommand.php

@@ -54,10 +54,6 @@ abstract class BaseCommand extends Command
         }
 
         set_error_handler(static function ($error_no, $error_msg, $error_file, $error_line) {
-            // Respect the @ suppression operator (error_reporting() returns 0 when @ is used)
-            if (error_reporting() === 0) {
-                return true;
-            }
             $tips = [
                 E_WARNING => ['PHP Warning: ', 'warning'],
                 E_NOTICE => ['PHP Notice: ', 'notice'],

src/StaticPHP/Command/CheckUpdateCommand.php

@@ -23,7 +23,6 @@ class CheckUpdateCommand extends BaseCommand
         $this->addArgument('artifact', InputArgument::OPTIONAL, 'The name of the artifact(s) to check for updates, comma-separated (default: all downloaded artifacts)');
         $this->addOption('json', null, null, 'Output result in JSON format');
         $this->addOption('bare', null, null, 'Check update without requiring the artifact to be downloaded first (old version will be null)');
-        $this->addOption('installed', null, null, 'Compare against the version actually installed on disk (tool packages only) instead of the download cache; falls back to normal behavior for artifacts with no recorded installed version');
         $this->addOption('parallel', 'p', InputOption::VALUE_REQUIRED, 'Number of parallel update checks (default: 10)', 10);
 
         // --with-php option for checking updates with a specific PHP version context
@@ -46,9 +45,8 @@ class CheckUpdateCommand extends BaseCommand
         try {
             $downloader = new ArtifactDownloader($this->input->getOptions());
             $bare = (bool) $this->getOption('bare');
-            $use_installed = (bool) $this->getOption('installed');
             if ($this->getOption('json')) {
-                $results = $downloader->checkUpdates($artifacts, bare: $bare, use_installed: $use_installed);
+                $results = $downloader->checkUpdates($artifacts, bare: $bare);
                 $outputs = [];
                 foreach ($results as $artifact => $result) {
                     $outputs[$artifact] = [
@@ -61,7 +59,7 @@ class CheckUpdateCommand extends BaseCommand
                 $this->output->writeln(json_encode($outputs, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
                 return static::OK;
             }
-            $downloader->checkUpdates($artifacts, bare: $bare, use_installed: $use_installed, onResult: function (string $artifact, CheckUpdateResult $result) {
+            $downloader->checkUpdates($artifacts, bare: $bare, onResult: function (string $artifact, CheckUpdateResult $result) {
                 if ($result->unsupported) {
                     $this->output->writeln("Artifact <info>{$artifact}</info> does not support update checking, <comment>skipped</comment>");
                 } elseif (!$result->needUpdate) {

src/StaticPHP/Command/CraftCommand.php

@@ -36,15 +36,6 @@ class CraftCommand extends BaseCommand
         // set verbosity
         $this->output->setVerbosity($craft['verbosity']);
 
-        // sync logger level and ApplicationContext debug mode to match the new verbosity
-        $level = match ($this->output->getVerbosity()) {
-            OutputInterface::VERBOSITY_VERBOSE => 'info',
-            OutputInterface::VERBOSITY_VERY_VERBOSE, OutputInterface::VERBOSITY_DEBUG => 'debug',
-            default => 'warning',
-        };
-        logger()->setLevel($level);
-        ApplicationContext::setDebug($this->output->getVerbosity() >= OutputInterface::VERBOSITY_DEBUG);
-
         // apply env
         array_walk($craft['extra-env'], fn ($v, $k) => f_putenv("{$k}={$v}"));
 
@@ -119,7 +110,7 @@ class CraftCommand extends BaseCommand
      *     shared-extensions: array<string>,
      *     packages: array<string>,
      *     sapi: array<string>,
-     *     verbosity: 128|16|256|32|64|8,
+     *     verbosity: int,
      *     debug: bool,
      *     clean-build: bool,
      *     build-options: array<string, mixed>,
@@ -180,16 +171,11 @@ class CraftCommand extends BaseCommand
         }
 
         // verbosity
+        $verbosity_level = $craft['verbosity'] ?? OutputInterface::VERBOSITY_NORMAL;
         $debug = $craft['debug'] ?? false;
-        $verbosity_level = $debug
+        if ($debug) {
-            ? OutputInterface::VERBOSITY_DEBUG
+            $verbosity_level = OutputInterface::VERBOSITY_DEBUG;
-            : match ((int) ($craft['verbosity'] ?? 0)) {
+        }
-                OutputInterface::VERBOSITY_QUIET => OutputInterface::VERBOSITY_QUIET,
-                OutputInterface::VERBOSITY_VERBOSE => OutputInterface::VERBOSITY_VERBOSE,
-                OutputInterface::VERBOSITY_VERY_VERBOSE => OutputInterface::VERBOSITY_VERY_VERBOSE,
-                OutputInterface::VERBOSITY_DEBUG => OutputInterface::VERBOSITY_DEBUG,
-                default => OutputInterface::VERBOSITY_NORMAL,
-            };
         $craft['verbosity'] = $verbosity_level;
 
         // clean-build (if true, reset before all builds)

src/StaticPHP/Command/Dev/DumpCapabilitiesCommand.php

@@ -54,8 +54,8 @@ class DumpCapabilitiesCommand extends BaseCommand
     {
         $result = [];
 
-        // library / target / virtual-target / tool
+        // library / target / virtual-target
-        foreach (PackageLoader::getPackages(['library', 'target', 'virtual-target', 'tool']) as $name => $pkg) {
+        foreach (PackageLoader::getPackages(['library', 'target', 'virtual-target']) as $name => $pkg) {
             $installable = [];
             $artifact = $pkg->getArtifact();
             if ($artifact !== null) {

src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php

@@ -16,7 +16,7 @@ class GenExtTestMatrixCommand extends BaseCommand
 
     private const array OS_RUNNERS = [
         'linux' => ['arch' => 'x86_64', 'runner' => 'ubuntu-latest', 'os_key' => 'Linux'],
-        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-2025', 'os_key' => 'Windows'],
+        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-latest', 'os_key' => 'Windows'],
         'macos' => ['arch' => 'aarch64', 'runner' => 'macos-15', 'os_key' => 'Darwin'],
     ];
 
@@ -60,8 +60,6 @@ class GenExtTestMatrixCommand extends BaseCommand
         'glfw',
         'imagick',
         'intl',
-        'mongodb',
-        'gmssl',
     ];
 
     /**
@@ -107,12 +105,7 @@ class GenExtTestMatrixCommand extends BaseCommand
         // Separate into regular and virtual extensions (build-static:false excluded globally)
         $all_regular = [];
         $all_virtual = [];
-        $all_libraries = [];
         foreach ($all as $pkg_name => $config) {
-            if (($config['type'] ?? '') === 'library') {
-                $all_libraries[$pkg_name] = $config;
-                continue;
-            }
             if (($config['type'] ?? '') !== 'php-extension') {
                 continue;
             }
@@ -159,7 +152,10 @@ class GenExtTestMatrixCommand extends BaseCommand
                     $raw,
                     fn ($d) => isset($pool_set[$d]) && $d !== $pkg_name
                 ));
-                $os_lib_deps[$this->displayName($pkg_name)] = $this->collectLibraryDeps($raw, $all_libraries, $os);
+                $os_lib_deps[$this->displayName($pkg_name)] = array_values(array_filter(
+                    $raw,
+                    fn ($d) => !str_starts_with($d, 'ext-')
+                ));
             }
             $all_ext_lib_deps[$os] = $os_lib_deps;
 
@@ -248,23 +244,22 @@ class GenExtTestMatrixCommand extends BaseCommand
             }
         }
 
-        if (!empty($filter_extensions) || !empty($filter_libs)) {
+        if (!empty($filter_extensions)) {
-            $entries = array_values(array_filter($entries, function (array $entry) use ($filter_extensions, $filter_libs, $all_ext_lib_deps): bool {
+            $entries = array_values(array_filter($entries, function (array $entry) use ($filter_extensions): bool {
                 $names = explode(',', $entry['extension']);
+                return count(array_intersect($names, $filter_extensions)) > 0;
+            }));
+        }
 
-                if (!empty($filter_extensions) && count(array_intersect($names, $filter_extensions)) > 0) {
+        if (!empty($filter_libs)) {
-                    return true;
+            $entries = array_values(array_filter($entries, function (array $entry) use ($filter_libs, $all_ext_lib_deps): bool {
-                }
+                $names = explode(',', $entry['extension']);
-
+                $lib_deps = $all_ext_lib_deps[$entry['os']] ?? [];
-                if (!empty($filter_libs)) {
+                foreach ($names as $name) {
-                    $lib_deps = $all_ext_lib_deps[$entry['os']] ?? [];
+                    if (count(array_intersect($lib_deps[$name] ?? [], $filter_libs)) > 0) {
-                    foreach ($names as $name) {
+                        return true;
-                        if (count(array_intersect($lib_deps[$name] ?? [], $filter_libs)) > 0) {
-                            return true;
-                        }
                     }
                 }
-
                 return false;
             }));
         }
@@ -303,41 +298,6 @@ class GenExtTestMatrixCommand extends BaseCommand
         return str_starts_with($pkg_name, 'ext-') ? substr($pkg_name, 4) : $pkg_name;
     }
 
-    /**
-     * Collect direct and transitive library dependencies from a package dependency list.
-     *
-     * @param string[]               $deps
-     * @param array<string, mixed[]> $library_configs
-     * @param array<string, true>    $seen
-     *
-     * @return string[]
-     */
-    private function collectLibraryDeps(array $deps, array $library_configs, string $platform, array $seen = []): array
-    {
-        $collected = [];
-        foreach ($deps as $dep) {
-            if (str_starts_with($dep, 'ext-') || isset($seen[$dep])) {
-                continue;
-            }
-
-            $seen[$dep] = true;
-            $collected[$dep] = $dep;
-
-            if (!isset($library_configs[$dep])) {
-                continue;
-            }
-
-            $child_deps = array_merge(
-                $this->resolvePlatformList($library_configs[$dep], 'depends', $platform),
-                $this->resolvePlatformList($library_configs[$dep], 'suggests', $platform),
-            );
-            foreach ($this->collectLibraryDeps($child_deps, $library_configs, $platform, $seen) as $child_dep) {
-                $collected[$child_dep] = $child_dep;
-            }
-        }
-        return array_values($collected);
-    }
-
     /**
      * Split orphans into batches such that no two conflicting extensions share a batch.
      * Uses a greedy graph-coloring approach.

src/StaticPHP/Command/Dev/TestBotCommand.php

@@ -154,7 +154,7 @@ class TestBotCommand extends BaseCommand
             'targets' => array_values($targets),
             'gen_matrix_args' => $gen_matrix_args,
             'gen_matrix_args_tier2' => $gen_matrix_args_tier2,
-            'php_versions' => $php_versions,
+            'php_versions' => array_values($php_versions),
             'tier2' => $tier2,
             'comment_body' => $comment_body,
         ];
@@ -253,13 +253,6 @@ class TestBotCommand extends BaseCommand
             $fmt($targets),
         );
 
-        $available_labels = implode(', ', [
-            '`need-test` (gate)',
-            '`test/linux` `test/windows` `test/macos` (platform)',
-            '`test/tier2` (extra arch)',
-            '`test/php-83` `test/php-84` (PHP version)',
-        ]);
-
         // Case 1: need-test absent → invite the author to add it
         if (!$need_test) {
             return implode("\n", [
@@ -268,9 +261,11 @@ class TestBotCommand extends BaseCommand
                 '',
                 $detected,
                 '',
-                'To trigger extension build tests on this PR, add the `need-test` label.',
+                'To trigger extension build tests on this PR, add the `need-test` label:',
                 '',
-                '**Available labels**: ' . $available_labels,
+                '**Gate**: `need-test`',
+                '**Platform filter** (optional, default all): `test/linux` `test/windows` `test/macos` · `test/tier2`',
+                '**PHP version** (optional, default 8.5): `test/php-83` `test/php-84`',
             ]);
         }
 
@@ -312,7 +307,6 @@ class TestBotCommand extends BaseCommand
             '',
             $detected,
             '**Active labels**: ' . $labels_str,
-            '**Available labels**: ' . $available_labels,
             '**Config**: ' . implode(' + ', $platform_parts) . ' | ' . $php_str,
         ]);
     }

src/StaticPHP/Command/DoctorCommand.php

@@ -13,7 +13,7 @@ class DoctorCommand extends BaseCommand
 {
     public function configure(): void
     {
-        $this->addOption('auto-fix', 'y', InputOption::VALUE_OPTIONAL, 'Automatically fix failed items (if possible)', false);
+        $this->addOption('auto-fix', null, InputOption::VALUE_OPTIONAL, 'Automatically fix failed items (if possible)', false);
     }
 
     public function handle(): int

src/StaticPHP/Command/InstallPackageCommand.php

@@ -23,7 +23,7 @@ class InstallPackageCommand extends BaseCommand
             'The package to install (name or path)',
             suggestedValues: function (CompletionInput $input) {
                 $packages = [];
-                foreach (PackageLoader::getPackages(['target', 'virtual-target', 'tool']) as $name => $_) {
+                foreach (PackageLoader::getPackages(['target', 'virtual-target']) as $name => $_) {
                     $packages[] = $name;
                 }
                 $val = $input->getCompletionValue();

src/StaticPHP/Command/ResetCommand.php

@@ -4,14 +4,13 @@ declare(strict_types=1);
 
 namespace StaticPHP\Command;
 
-use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+use function Laravel\Prompts\confirm;
 
 #[AsCommand('reset')]
 class ResetCommand extends BaseCommand
@@ -47,11 +46,7 @@ class ResetCommand extends BaseCommand
 
         // Confirm with user unless --yes is specified
         if (!$this->input->getOption('yes')) {
-            $helper = $this->getHelper('question');
+            if (!confirm('Are you sure you want to continue?', false)) {
-            if (!$helper instanceof QuestionHelper) {
-                throw new SPCInternalException('Question helper not provided');
-            }
-            if (!$helper->ask($this->input, $this->output, new ConfirmationQuestion('Are you sure you want to continue? [y/N] ', false))) {
                 InteractiveTerm::error(message: 'Reset operation cancelled.');
                 return static::SUCCESS;
             }

src/StaticPHP/Config/ArtifactConfig.php

@@ -38,7 +38,7 @@ class ArtifactConfig
      */
     public static function loadFromFile(string $file, string $registry_name): string
     {
-        $content = @file_get_contents($file);
+        $content = file_get_contents($file);
         if ($content === false) {
             throw new WrongUsageException("Failed to read artifact config file: {$file}");
         }

src/StaticPHP/Config/ConfigType.php

@@ -19,7 +19,6 @@ enum ConfigType
         'php-extension',
         'target',
         'virtual-target',
-        'tool',
     ];
 
     public static function validateLicenseField(mixed $value): bool

src/StaticPHP/Config/ConfigValidator.php

@@ -24,10 +24,6 @@ class ConfigValidator
         'lang' => ConfigType::STRING,
         'frameworks' => ConfigType::LIST_ARRAY, // @
 
-        // build-time tool dependency declaration (resolved independently of the library
-        // dependency graph, see PackageInstaller::collectRequiredTools())
-        'tools' => ConfigType::LIST_ARRAY, // @
-
         // php-extension type fields
         'php-extension' => ConfigType::ASSOC_ARRAY,
         'zend-extension' => ConfigType::BOOL,
@@ -48,13 +44,6 @@ class ConfigValidator
         'path' => ConfigType::LIST_ARRAY, // @
         'env' => ConfigType::ASSOC_ARRAY, // @
         'append-env' => ConfigType::ASSOC_ARRAY, // @
-
-        // tool type fields (nested under 'tool' key)
-        'tool' => ConfigType::ASSOC_ARRAY,
-        'provides' => ConfigType::LIST_ARRAY,
-        'binary-subdir' => ConfigType::STRING,
-        'install-root' => ConfigType::STRING,
-        'min-version' => ConfigType::STRING,
     ];
 
     public const array PACKAGE_FIELDS = [
@@ -67,9 +56,6 @@ class ConfigValidator
         'lang' => false,
         'frameworks' => false, // @
 
-        // build-time tool dependency declaration
-        'tools' => false, // @
-
         // php-extension type fields
         'php-extension' => false,
 
@@ -81,9 +67,6 @@ class ConfigValidator
         'path' => false, // @
         'env' => false, // @
         'append-env' => false, // @
-
-        // tool fields (nested object)
-        'tool' => false,
     ];
 
     public const array SUFFIX_ALLOWED_FIELDS = [
@@ -95,7 +78,6 @@ class ConfigValidator
         'path',
         'env',
         'append-env',
-        'tools',
     ];
 
     public const array PHP_EXTENSION_FIELDS = [
@@ -110,13 +92,6 @@ class ConfigValidator
         'os' => false,
     ];
 
-    public const array TOOL_FIELDS = [
-        'provides' => true,
-        'binary-subdir' => false,
-        'install-root' => false,
-        'min-version' => false,
-    ];
-
     public const array ARTIFACT_TYPE_FIELDS = [ // [required_fields, optional_fields]
         'filelist' => [['url', 'regex'], ['extract']],
         'git' => [['url'], ['extract', 'submodules', 'rev', 'regex']],
@@ -245,8 +220,8 @@ class ConfigValidator
             $fields = self::SUFFIX_ALLOWED_FIELDS;
             self::validateSuffixAllowedFields($name, $pkg, $fields, $suffixes);
 
-            // check if "library|target|tool" package has artifact field
+            // check if "library|target" package has artifact field for target and library types
-            if (in_array($pkg['type'], ['target', 'library', 'tool']) && !isset($pkg['artifact'])) {
+            if (in_array($pkg['type'], ['target', 'library']) && !isset($pkg['artifact'])) {
                 throw new ValidationException("Package [{$name}] in {$config_file_name} of type '{$pkg['type']}' must have an 'artifact' field");
             }
 
@@ -260,11 +235,6 @@ class ConfigValidator
                 self::validatePhpExtensionFields($name, $pkg);
             }
 
-            // check if "tool" package has tool specific fields and validate inside
-            if ($pkg['type'] === 'tool') {
-                self::validateToolFields($name, $pkg);
-            }
-
             // check for unknown fields
             self::validateNoInvalidFields('package', $name, $pkg, array_keys(self::PACKAGE_FIELD_TYPES));
         }
@@ -427,29 +397,6 @@ class ConfigValidator
         self::validateNoInvalidFields('php-extension', $name, $pkg['php-extension'], array_keys(self::PHP_EXTENSION_FIELDS));
     }
 
-    /**
-     * Validate tool specific fields for tool package type.
-     */
-    private static function validateToolFields(int|string $name, mixed $pkg): void
-    {
-        if (!isset($pkg['tool'])) {
-            throw new ValidationException("Package {$name} of type 'tool' must have a 'tool' field");
-        }
-        if (!is_assoc_array($pkg['tool'])) {
-            throw new ValidationException("Package {$name} [tool] must be an object");
-        }
-        foreach (self::TOOL_FIELDS as $field => $required) {
-            if ($required && !isset($pkg['tool'][$field])) {
-                throw new ValidationException("Package {$name} [tool] must have required field [{$field}]");
-            }
-            if (isset($pkg['tool'][$field])) {
-                self::validatePackageFieldType($field, $pkg['tool'][$field], $name);
-            }
-        }
-        // check for unknown fields in tool
-        self::validateNoInvalidFields('tool', $name, $pkg['tool'], array_keys(self::TOOL_FIELDS));
-    }
-
     private static function validateNoInvalidFields(string $config_type, int|string $item_name, mixed $item_content, array $allowed_fields): void
     {
         foreach ($item_content as $k => $v) {

src/StaticPHP/Config/PackageConfig.php

@@ -16,7 +16,7 @@ class PackageConfig
 
     /**
      * Load package configurations from a specified directory.
-     * Only processes .json, .yml, and .yaml files (skips .gitkeep etc.).
+     * It will look for files matching the pattern 'pkg.*.json' and 'pkg.json'.
      */
     public static function loadFromDir(string $dir, string $registry_name): array
     {
@@ -28,10 +28,6 @@ class PackageConfig
         $files = FileSystem::scanDirFiles($dir, false);
         if (is_array($files)) {
             foreach ($files as $file) {
-                $ext = pathinfo($file, PATHINFO_EXTENSION);
-                if (!in_array($ext, ['json', 'yml', 'yaml'], true)) {
-                    continue;
-                }
                 self::loadFromFile($file, $registry_name);
                 $loaded[] = $file;
             }

src/StaticPHP/ConsoleApplication.php

@@ -32,10 +32,7 @@ use StaticPHP\Command\SPCConfigCommand;
 use StaticPHP\Package\TargetPackage;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Registry\Registry;
-use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
 class ConsoleApplication extends Application
 {
@@ -107,15 +104,4 @@ class ConsoleApplication extends Application
     {
         self::$additional_commands = array_merge(self::$additional_commands, $additional_commands);
     }
-
-    /**
-     * Hook Symfony's doRun() to inject the real input/output into InteractiveTerm before
-     * any command executes. From this point forward, InteractiveTerm uses the configured
-     * Console (respecting --no-ansi, --verbose, etc.) instead of the lazy STDERR fallback.
-     */
-    public function doRun(InputInterface $input, OutputInterface $output): int
-    {
-        InteractiveTerm::init($input, $output);
-        return parent::doRun($input, $output);
-    }
 }

src/StaticPHP/DI/ApplicationContext.php

@@ -79,11 +79,11 @@ class ApplicationContext
     /**
      * Get a service from the container.
      *
-     * @template T of object
+     * @template T
      *
-     * @param class-string<T>|string $id Service identifier
+     * @param class-string<T> $id Service identifier
      *
-     * @return ($id is class-string<T> ? T : mixed)
+     * @return null|T
      */
     public static function get(string $id): mixed
     {

src/StaticPHP/Doctor/Doctor.php

@@ -11,14 +11,11 @@ use StaticPHP\Registry\DoctorLoader;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\InteractiveTerm;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use ZM\Logger\ConsoleColor;
 
+use function Laravel\Prompts\confirm;
+
 readonly class Doctor
 {
     public function __construct(private ?OutputInterface $output = null, private int $auto_fix = FIX_POLICY_PROMPT, public readonly bool $interactive = true)
@@ -128,14 +125,9 @@ readonly class Doctor
             return false;
         }
         // prompt for fix
-        if ($this->auto_fix === FIX_POLICY_PROMPT) {
+        if ($this->auto_fix === FIX_POLICY_PROMPT && !confirm('Do you want to try to fix this issue now?')) {
-            $helper = new QuestionHelper();
+            $this->output?->writeln('<comment>You canceled fix.</comment>');
-            $input = ApplicationContext::has(InputInterface::class) ? ApplicationContext::get(InputInterface::class) : new ArrayInput([]);
+            return false;
-            $output = ApplicationContext::has(OutputInterface::class) ? ApplicationContext::get(OutputInterface::class) : $this->output ?? new ConsoleOutput();
-            if (!$helper->ask($input, $output, new ConfirmationQuestion('Do you want to try to fix this issue now? [Y/n] ', true))) {
-                $this->output?->writeln('<comment>You canceled fix.</comment>');
-                return false;
-            }
         }
         // perform fix
         InteractiveTerm::indicateProgress("Fixing {$result->getFixItem()} ... ");

src/StaticPHP/Doctor/Item/WindowsToolCheck.php

@@ -54,24 +54,13 @@ class WindowsToolCheck
         return CheckResult::ok();
     }
 
-    #[CheckItem('if msys2-build-essentials is installed', limit_os: 'Windows', level: 996)]
+    #[CheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 996)]
-    public function checkMsys2(): ?CheckResult
+    public function checkSDK(): ?CheckResult
     {
-        $marker = PKG_ROOT_PATH . '\msys2-build-essentials\.spc-msys2-initialized';
+        if (!file_exists(getenv('PHP_SDK_PATH') . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) {
-        if (!file_exists($marker)) {
+            return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk');
-            return CheckResult::fail('msys2-build-essentials not installed', 'install-msys2-build-essentials');
         }
-        return CheckResult::ok(PKG_ROOT_PATH . '\msys2-build-essentials\msys64');
+        return CheckResult::ok(getenv('PHP_SDK_PATH'));
-    }
-
-    #[CheckItem('if 7za.exe is installed', limit_os: 'Windows', level: 999)]
-    public function check7zaWin(): ?CheckResult
-    {
-        $path = FileSystem::convertPath(PKG_ROOT_PATH . '\bin\7za.exe');
-        if (!file_exists($path)) {
-            return CheckResult::fail('7za.exe not found', 'install-7za-win');
-        }
-        return CheckResult::ok($path);
     }
 
     #[CheckItem('if nasm installed', level: 995)]
@@ -123,20 +112,12 @@ class WindowsToolCheck
         return true;
     }
 
-    #[FixItem('install-msys2-build-essentials')]
+    #[FixItem('install-php-sdk')]
-    public function installMsys2(): bool
+    public function installSDK(): bool
     {
+        FileSystem::removeDir(getenv('PHP_SDK_PATH'));
         $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('msys2-build-essentials');
+        $installer->addInstallPackage('php-sdk-binary-tools');
-        $installer->run(true);
-        return true;
-    }
-
-    #[FixItem('install-7za-win')]
-    public function install7zaWin(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('7za-win');
         $installer->run(true);
         return true;
     }

src/StaticPHP/Exception/ExceptionHandler.php

@@ -111,7 +111,7 @@ class ExceptionHandler
 
     private static function logError($message, int $indent_space = 0, bool $output_log = true, string $color = 'red'): void
     {
-        $spc_log = fopen(SPC_OUTPUT_LOG, 'a');
+        $spc_log = spc_log_stream(SPC_OUTPUT_LOG);
         $msg = explode("\n", (string) $message);
         foreach ($msg as $v) {
             $line = str_pad($v, strlen($v) + $indent_space, ' ', STR_PAD_LEFT);

src/StaticPHP/Package/LibraryPackage.php

@@ -113,6 +113,60 @@ class LibraryPackage extends Package
         }
     }
 
+    /**
+     * Get extra CFLAGS for current package.
+     * You need to define the environment variable in the format of {LIBRARY_NAME}_CFLAGS
+     * where {LIBRARY_NAME} is the snake_case name of the library.
+     * For example, for libjpeg, the environment variable should be libjpeg_CFLAGS.
+     */
+    public function getLibExtraCFlags(): string
+    {
+        // get environment variable
+        $env = getenv($this->getSnakeCaseName() . '_CFLAGS') ?: '';
+        // get default c flags
+        $arch_c_flags = getenv('SPC_DEFAULT_CFLAGS') ?: '';
+        if (!empty(getenv('SPC_DEFAULT_CFLAGS')) && !str_contains($env, $arch_c_flags)) {
+            $env .= ' ' . $arch_c_flags;
+        }
+        return trim($env);
+    }
+
+    /**
+     * Get extra CXXFLAGS for current package.
+     * You need to define the environment variable in the format of {LIBRARY_NAME}_CXXFLAGS
+     * where {LIBRARY_NAME} is the snake_case name of the library.
+     * For example, for libjpeg, the environment variable should be libjpeg_CXXFLAGS.
+     */
+    public function getLibExtraCxxFlags(): string
+    {
+        // get environment variable
+        $env = getenv($this->getSnakeCaseName() . '_CXXFLAGS') ?: '';
+        // get default cxx flags
+        $arch_cxx_flags = getenv('SPC_DEFAULT_CXXFLAGS') ?: '';
+        if (!empty(getenv('SPC_DEFAULT_CXXFLAGS')) && !str_contains($env, $arch_cxx_flags)) {
+            $env .= ' ' . $arch_cxx_flags;
+        }
+        return trim($env);
+    }
+
+    /**
+     * Get extra LDFLAGS for current package.
+     * You need to define the environment variable in the format of {LIBRARY_NAME}_LDFLAGS
+     * where {LIBRARY_NAME} is the snake_case name of the library.
+     * For example, for libjpeg, the environment variable should be libjpeg_LDFLAGS.
+     */
+    public function getLibExtraLdFlags(): string
+    {
+        // get environment variable
+        $env = getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: '';
+        // get default ld flags
+        $arch_ld_flags = getenv('SPC_DEFAULT_LDFLAGS') ?: '';
+        if (!empty(getenv('SPC_DEFAULT_LDFLAGS')) && !str_contains($env, $arch_ld_flags)) {
+            $env .= ' ' . $arch_ld_flags;
+        }
+        return trim($env);
+    }
+
     /**
      * Patch pkgconfig file prefix, exec_prefix, libdir, includedir for correct build.
      *
@@ -310,6 +364,17 @@ class LibraryPackage extends Package
         return $res['libs'];
     }
 
+    /**
+     * Get extra LIBS for current package.
+     * You need to define the environment variable in the format of {LIBRARY_NAME}_LIBS
+     * where {LIBRARY_NAME} is the snake_case name of the library.
+     * For example, for libjpeg, the environment variable should be libjpeg_LIBS.
+     */
+    public function getLibExtraLibs(): string
+    {
+        return getenv($this->getSnakeCaseName() . '_LIBS') ?: '';
+    }
+
     /**
      * Get tar compress options from suffix
      *

src/StaticPHP/Package/Package.php

@@ -120,20 +120,6 @@ abstract class Package
         return false;
     }
 
-    /**
-     * Get the target directory where this package's artifacts should be placed.
-     *
-     * Libraries install to BUILD_ROOT_PATH (static-libs, headers, pkg-configs).
-     * Tools install to PKG_ROOT_PATH (executables).
-     * Extensions install to php-src/ext/ (shared objects).
-     *
-     * Override in subclasses to change the default.
-     */
-    public function getInstallTarget(): string
-    {
-        return BUILD_ROOT_PATH;
-    }
-
     /**
      * Add a stage to the package.
      */
@@ -284,71 +270,6 @@ abstract class Package
         return $this->getArtifact()?->hasPlatformBinary() ?? false;
     }
 
-    /**
-     * Get extra CFLAGS for current package.
-     * You need to define the environment variable in the format of {PACKAGE_NAME}_CFLAGS
-     * where {PACKAGE_NAME} is the snake_case name of the package.
-     * For example, for libjpeg, the environment variable should be libjpeg_CFLAGS.
-     */
-    public function getLibExtraCFlags(): string
-    {
-        // get environment variable
-        $env = getenv($this->getSnakeCaseName() . '_CFLAGS') ?: '';
-        // get default c flags
-        $arch_c_flags = getenv('SPC_DEFAULT_CFLAGS') ?: '';
-        if (!empty(getenv('SPC_DEFAULT_CFLAGS')) && !str_contains($env, $arch_c_flags)) {
-            $env .= ' ' . $arch_c_flags;
-        }
-        return trim($env);
-    }
-
-    /**
-     * Get extra CXXFLAGS for current package.
-     * You need to define the environment variable in the format of {PACKAGE_NAME}_CXXFLAGS
-     * where {PACKAGE_NAME} is the snake_case name of the package.
-     * For example, for libjpeg, the environment variable should be libjpeg_CXXFLAGS.
-     */
-    public function getLibExtraCxxFlags(): string
-    {
-        // get environment variable
-        $env = getenv($this->getSnakeCaseName() . '_CXXFLAGS') ?: '';
-        // get default cxx flags
-        $arch_cxx_flags = getenv('SPC_DEFAULT_CXXFLAGS') ?: '';
-        if (!empty(getenv('SPC_DEFAULT_CXXFLAGS')) && !str_contains($env, $arch_cxx_flags)) {
-            $env .= ' ' . $arch_cxx_flags;
-        }
-        return trim($env);
-    }
-
-    /**
-     * Get extra LDFLAGS for current package.
-     * You need to define the environment variable in the format of {PACKAGE_NAME}_LDFLAGS
-     * where {PACKAGE_NAME} is the snake_case name of the package.
-     * For example, for libjpeg, the environment variable should be libjpeg_LDFLAGS.
-     */
-    public function getLibExtraLdFlags(): string
-    {
-        // get environment variable
-        $env = getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: '';
-        // get default ld flags
-        $arch_ld_flags = getenv('SPC_DEFAULT_LDFLAGS') ?: '';
-        if (!empty(getenv('SPC_DEFAULT_LDFLAGS')) && !str_contains($env, $arch_ld_flags)) {
-            $env .= ' ' . $arch_ld_flags;
-        }
-        return trim($env);
-    }
-
-    /**
-     * Get extra LIBS for current package.
-     * You need to define the environment variable in the format of {PACKAGE_NAME}_LIBS
-     * where {PACKAGE_NAME} is the snake_case name of the package.
-     * For example, for libjpeg, the environment variable should be libjpeg_LIBS.
-     */
-    public function getLibExtraLibs(): string
-    {
-        return getenv($this->getSnakeCaseName() . '_LIBS') ?: '';
-    }
-
     /**
      * Get the snake_case name of the package.
      */

src/StaticPHP/Package/PackageBuilder.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace StaticPHP\Package;
 
-use StaticPHP\Artifact\ArtifactCache;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Exception\SPCException;
@@ -40,8 +39,8 @@ class PackageBuilder
     public function buildPackage(Package $package, bool $force = false): int
     {
         // init build dirs
-        if (!$package instanceof LibraryPackage && !$package instanceof ToolPackage) {
+        if (!$package instanceof LibraryPackage) {
-            throw new SPCInternalException('Please, never try to build non-library, non-tool packages directly.');
+            throw new SPCInternalException('Please, never try to build non-library packages directly.');
         }
         FileSystem::createDir($package->getBuildRootPath());
         FileSystem::createDir($package->getIncludeDir());
@@ -79,14 +78,6 @@ class PackageBuilder
                     $this->installLicense($package, $license);
                 }
             }
-
-            // Record the installed version for tool packages built from source, so
-            // `check-update --installed` reflects what's actually on disk (mirrors the
-            // binary-install recording in PackageInstaller::installBinary()).
-            if ($package instanceof ToolPackage) {
-                $source_info = ApplicationContext::get(ArtifactCache::class)->getSourceInfo($package->getName());
-                ToolVersionRegistry::record($package->getName(), $source_info['version'] ?? null);
-            }
         } catch (SPCException $e) {
             // Ensure package information is bound if not already
             if ($e->getPackageInfo() === null) {

src/StaticPHP/Package/PackageInstaller.php

@@ -11,7 +11,6 @@ use StaticPHP\Artifact\ArtifactExtractor;
 use StaticPHP\Artifact\DownloaderOptions;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Exception\EnvironmentException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Runtime\SystemTarget;
@@ -76,9 +75,6 @@ class PackageInstaller
         }
         // special check for php target packages
         if (in_array($package->getName(), ['php', 'php-cli', 'php-fpm', 'php-micro', 'php-cgi', 'php-embed', 'frankenphp'], true)) {
-            if (!$package instanceof TargetPackage) {
-                throw new WrongUsageException("Package '{$package->getName()}' is expected to be a TargetPackage.");
-            }
             $this->handlePhpTargetPackage($package);
             return $this;
         }
@@ -175,7 +171,7 @@ class PackageInstaller
             // These must always download binary (not source), regardless of global prefer-source setting.
             $binary_only_packages = array_filter(
                 $this->packages,
-                fn ($p) => ($p instanceof LibraryPackage || $p instanceof ToolPackage)
+                fn ($p) => $p instanceof LibraryPackage
                     && !$this->isBuildPackage($p)
                     && !$p->hasStage('build')
                     && ($p->getArtifact()?->hasPlatformBinary() ?? false)
@@ -213,8 +209,8 @@ class PackageInstaller
         $builder = ApplicationContext::get(PackageBuilder::class);
         foreach ($this->packages as $package) {
             $is_to_build = $this->isBuildPackage($package);
-            $has_build_stage = ($package instanceof LibraryPackage || $package instanceof ToolPackage) && $package->hasStage('build');
+            $has_build_stage = $package instanceof LibraryPackage && $package->hasStage('build');
-            $should_use_binary = ($package instanceof LibraryPackage || $package instanceof ToolPackage) && ($package->getArtifact()?->shouldUseBinary() ?? false);
+            $should_use_binary = $package instanceof LibraryPackage && ($package->getArtifact()?->shouldUseBinary() ?? false);
             $has_source = $package->hasSource();
             if (!$is_to_build && $should_use_binary) {
                 // install binary
@@ -277,11 +273,6 @@ class PackageInstaller
 
         // perform after-install actions and emit post-install events
         $this->emitPostInstallEvents();
-
-        // Final verification: declared build-time tools should have been auto-installed by the
-        // pipeline above (they were merged into $this->packages in resolvePackages()). This only
-        // throws if a tool genuinely failed to become available (e.g. no artifact for this platform).
-        $this->ensureRequiredTools();
     }
 
     public function isBuildPackage(Package|string $package): bool
@@ -359,16 +350,12 @@ class PackageInstaller
         }
         // Fallback: if the download cache is missing (e.g. download failed or cache was cleared),
         // still check whether the files are physically present in buildroot.
-        // Note: TargetPackage extends LibraryPackage, but target packages have no
+        // Note: TargetPackage extends LibraryPackage, but target packages (e.g. zig) have no
         // static-libs/headers configured, so isInstalled() would trivially return true for them.
         // Only apply this fallback to pure library packages.
         if ($package instanceof LibraryPackage && !($package instanceof TargetPackage)) {
             return $package->isInstalled();
         }
-        // Tool packages: fall back to checking their provided binaries directly on disk.
-        if ($package instanceof ToolPackage) {
-            return $package->isInstalled();
-        }
         return false;
     }
 
@@ -517,16 +504,6 @@ class PackageInstaller
         }
 
         $status = $extractor->extract($artifact);
-
-        // Record the installed version for tool packages, so `check-update --installed` can
-        // compare against what's actually on disk instead of only the download cache (which
-        // only reflects the last download and may be stale or cleared). Recorded regardless of
-        // $status so the registry self-heals if it was deleted separately from the install dir.
-        if ($package instanceof ToolPackage) {
-            $cache_info = ApplicationContext::get(ArtifactCache::class)->getBinaryInfo($artifact->getName(), SystemTarget::getCurrentPlatformString());
-            ToolVersionRegistry::record($artifact->getName(), $cache_info['version'] ?? null);
-        }
-
         if ($status === SPC_STATUS_ALREADY_EXTRACTED) {
             return SPC_STATUS_ALREADY_INSTALLED;
         }
@@ -594,66 +571,6 @@ class PackageInstaller
         return null;
     }
 
-    /**
-     * Collect all tool packages required by the currently resolved packages.
-     *
-     * Reads the 'tools' field from each resolved package's YAML config.
-     * The field supports platform suffixes (tools@windows, tools@linux, etc.)
-     * resolved automatically by PackageConfig::get().
-     *
-     * Tools are NOT part of the library dependency graph — they are
-     * build-time prerequisites that must be installed before any library
-     * build begins.
-     *
-     * @return string[] Unique tool package names required for this build
-     */
-    public function collectRequiredTools(): array
-    {
-        $tools = [];
-        foreach ($this->packages as $package) {
-            $deps = PackageConfig::get($package->getName(), 'tools', []);
-            foreach ((array) $deps as $tool_name) {
-                $tools[$tool_name] = true;
-            }
-        }
-        return array_keys($tools);
-    }
-
-    /**
-     * Check that all required tools are installed.
-     *
-     * Iterates through tools collected by collectRequiredTools(),
-     * resolves each to a ToolPackage instance, and checks isInstalled().
-     *
-     * @return array{missing: array<string>, installed: array<string>}
-     */
-    public function checkRequiredTools(): array
-    {
-        $missing = [];
-        $installed = [];
-        foreach ($this->collectRequiredTools() as $tool_name) {
-            try {
-                $tool = PackageLoader::getPackage($tool_name);
-            } catch (WrongUsageException) {
-                $missing[] = $tool_name;
-                logger()->warning("Required tool '{$tool_name}' is not registered as a package.");
-                continue;
-            }
-
-            if (!$tool instanceof ToolPackage) {
-                logger()->warning("Package '{$tool_name}' is declared as a tool dependency but is not a ToolPackage (type: {$tool->getType()}).");
-                continue;
-            }
-
-            if ($tool->isInstalled()) {
-                $installed[] = $tool_name;
-            } else {
-                $missing[] = $tool_name;
-            }
-        }
-        return ['missing' => $missing, 'installed' => $installed];
-    }
-
     /**
      * @param Package[] $packages
      */
@@ -677,8 +594,8 @@ class PackageInstaller
      */
     private function validatePackageArtifact(Package $package): void
     {
-        // target, library and tool packages must have at least source or platform binary
+        // target and library must have at least source or platform binary
-        if (in_array($package->getType(), ['library', 'target', 'tool']) && !$package->getArtifact()?->hasSource() && !$package->getArtifact()?->hasPlatformBinary()) {
+        if (in_array($package->getType(), ['library', 'target']) && !$package->getArtifact()?->hasSource() && !$package->getArtifact()?->hasPlatformBinary()) {
             throw new WrongUsageException("Validation failed: Target package '{$package->getName()}' has no source or current platform (" . SystemTarget::getCurrentPlatformString() . ') binary defined.');
         }
     }
@@ -711,62 +628,11 @@ class PackageInstaller
             $this->packages[$pkg_name] = PackageLoader::getPackage($pkg_name);
         }
 
-        // Merge in build-time tool packages declared via 'tools'/'tools@platform' fields on the
-        // packages resolved above. Tools are intentionally NOT part of the library dependency graph
-        // (DependencyResolver), but still need to ride the normal download/extract/install pipeline
-        // so they get auto-installed like any other package.
-        //
-        // Tools are prepended so they install BEFORE any package that declares them — otherwise a
-        // library that invokes e.g. jom.exe during its build stage would fail because the tool
-        // hasn't been extracted yet (tools were appended after the dependency graph in insertion
-        // order, which is also the build-loop iteration order).
-        $tool_packages = [];
-        foreach ($this->collectRequiredTools() as $tool_name) {
-            if (isset($this->packages[$tool_name])) {
-                continue;
-            }
-            try {
-                $tool = PackageLoader::getPackage($tool_name);
-            } catch (WrongUsageException) {
-                continue; // will be reported as missing by ensureRequiredTools()
-            }
-            if ($tool instanceof ToolPackage) {
-                $tool_packages[$tool_name] = $tool;
-            }
-        }
-        // Prepend: tools first, then the dependency-resolved packages.
-        $this->packages = [...$tool_packages, ...$this->packages];
-
         foreach ($this->packages as $package) {
             $this->injectPackageEnvs($package);
         }
     }
 
-    /**
-     * Ensure all required tools are installed, throwing if any are missing.
-     *
-     * Called at the end of run(), after the normal download/extract/build/install pipeline
-     * has had a chance to auto-install any tool package merged in resolvePackages(). This is
-     * a final safety net: it only throws if a declared tool still isn't available afterward
-     * (e.g. no artifact defined for the current platform, or the tool name doesn't resolve to
-     * a registered ToolPackage). "General" tools not declared via any package's 'tools' field
-     * (e.g. zig, musl-toolchain) are not covered here and remain purely Doctor-driven.
-     */
-    private function ensureRequiredTools(): void
-    {
-        $status = $this->checkRequiredTools();
-        if (empty($status['missing'])) {
-            if (!empty($status['installed'])) {
-                logger()->info('Required tools: ' . implode(', ', $status['installed']) . ' — all installed.');
-            }
-            return;
-        }
-
-        $msg = 'Missing required build tools: ' . implode(', ', $status['missing']) . "\n";
-        $msg .= "Run 'bin/spc doctor' to check your environment, or install the missing tools manually.";
-        throw new EnvironmentException($msg);
-    }
-
     private function injectPackageEnvs(Package $package): void
     {
         $name = $package->getName();