refactor: compose optional tools by import and preserve failure feedback

.github/workflows/ci.yml

@@ -317,15 +317,15 @@ jobs:
       - name: Run scanner functional regressions
         run: |
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 5m -v \
-            -run 'Test(ScannerFunctionalRegression|FullScannerFunctionalRegression)$' \
+            -run 'Test(ScannerFunctionalRegression|ComposedScannerFunctionalRegression)$' \
             ./exts/scanner
 
       - name: Run remaining full-tag unit variants
         run: |
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 5m \
             ./cmd/aiscan ./agent/skills ./tools/passive ./tools/scan/engine
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 5m \
-            -run '^TestKatanaProfileExtender$' \
+            -run '^TestCrawler(ProfilesAreExplicitlyComposed|FiltersAndDeduplicatesTargets)$' \
             ./tools/scan
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 5m \
             -run '^Test(Parse|Execute_|ResolvePath_|NameAndUsage|WithDefaultSession|Format)' \
@@ -394,7 +394,7 @@ jobs:
             ./tools/katana
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 2m -v \
             -run '^TestE2EKatanaDeepRendersAuthenticatedSPA$' \
-            ./tools/scan
+            ./tools/katana
 
   e2e:
     runs-on: ubuntu-22.04

.github/workflows/scanner-regression.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Run scanner functional regressions
         run: |
           go test -tags "$FULL_CAPS_TAGS" -count=1 -timeout 8m -v \
-            -run 'Test(ScannerFunctionalRegression|FullScannerFunctionalRegression)$' \
+            -run 'Test(ScannerFunctionalRegression|ComposedScannerFunctionalRegression)$' \
             ./exts/scanner
 
   race-stress:

agent/agent.go

@@ -137,7 +137,7 @@ func (a *Agent) Continue(ctx context.Context, opts ...RunOption) (*Result, error
 // SetProvider hot-swaps the LLM provider (and model, when non-empty) on the
 // agent. A run already in flight keeps the provider it snapshotted at start; the
 // next run picks up the new one. Safe to call concurrently with Run/Continue.
-func (a *Agent) SetProvider(p Provider, model string) {
+func (a *Agent) SetProvider(p providerpkg.Provider, model string) {
 	a.mu.Lock()
 	defer a.mu.Unlock()
 	a.Cfg.Provider = p
@@ -147,7 +147,7 @@ func (a *Agent) SetProvider(p Provider, model string) {
 }
 
 // SetProviderConfig hot-swaps the provider together with its model limits.
-func (a *Agent) SetProviderConfig(p Provider, providerConfig ProviderConfig) {
+func (a *Agent) SetProviderConfig(p providerpkg.Provider, providerConfig providerpkg.ProviderConfig) {
 	a.mu.Lock()
 	defer a.mu.Unlock()
 	a.Cfg.Provider = p