refactor(agent): converge runtime control, tool AOP, and timeline

.github/workflows/ci.yml

@@ -142,7 +142,7 @@ jobs:
       - name: Run proxy tool tests
         run: |
           go test -tags "re2_cgo re2_static" -race -count=1 -timeout 5m -v \
-            ./pkg/tools/proxy/
+            ./tools/proxy/
 
       - name: Run tmux command tests
         run: |
@@ -182,7 +182,7 @@ jobs:
         run: |
           go test -tags "full re2_cgo re2_static" -count=1 -timeout 5m -v \
             -run 'Test(ScannerFunctionalRegression|FullScannerFunctionalRegression)$' \
-            ./pkg/tools
+            ./tools
 
   # ── Generated templates tests (depends on tidy) ───────────────
 

cmd/agent/imports.go

@@ -1,3 +1,3 @@
 package main
 
-import _ "github.com/chainreactors/aiscan/pkg/tools/arsenal"
+import _ "github.com/chainreactors/aiscan/tools/arsenal"

cmd/aiscan/imports.go

@@ -4,14 +4,14 @@ package main
 // Each package has a register.go that calls command.RegisterFactory().
 
 import (
-	_ "github.com/chainreactors/aiscan/pkg/tools"
-	_ "github.com/chainreactors/aiscan/pkg/tools/arsenal"
-	_ "github.com/chainreactors/aiscan/pkg/tools/gogo"
-	_ "github.com/chainreactors/aiscan/pkg/tools/ioa"
-	_ "github.com/chainreactors/aiscan/pkg/tools/neutron"
-	_ "github.com/chainreactors/aiscan/pkg/tools/proton"
-	_ "github.com/chainreactors/aiscan/pkg/tools/proxy"
-	_ "github.com/chainreactors/aiscan/pkg/tools/search"
-	_ "github.com/chainreactors/aiscan/pkg/tools/spray"
-	_ "github.com/chainreactors/aiscan/pkg/tools/zombie"
+	_ "github.com/chainreactors/aiscan/tools"
+	_ "github.com/chainreactors/aiscan/tools/arsenal"
+	_ "github.com/chainreactors/aiscan/tools/gogo"
+	_ "github.com/chainreactors/aiscan/tools/ioa"
+	_ "github.com/chainreactors/aiscan/tools/neutron"
+	_ "github.com/chainreactors/aiscan/tools/proton"
+	_ "github.com/chainreactors/aiscan/tools/proxy"
+	_ "github.com/chainreactors/aiscan/tools/search"
+	_ "github.com/chainreactors/aiscan/tools/spray"
+	_ "github.com/chainreactors/aiscan/tools/zombie"
 )

cmd/aiscan/imports_full.go

@@ -3,7 +3,7 @@
 package main
 
 import (
-	_ "github.com/chainreactors/aiscan/pkg/tools/katana"
-	_ "github.com/chainreactors/aiscan/pkg/tools/passive"
-	_ "github.com/chainreactors/aiscan/pkg/tools/playwright"
+	_ "github.com/chainreactors/aiscan/tools/katana"
+	_ "github.com/chainreactors/aiscan/tools/passive"
+	_ "github.com/chainreactors/aiscan/tools/playwright"
 )

cmd/aiscan/setup.go

@@ -17,10 +17,10 @@ import (
 	"github.com/chainreactors/aiscan/pkg/aop"
 	"github.com/chainreactors/aiscan/pkg/commands"
 	"github.com/chainreactors/aiscan/pkg/telemetry"
-	"github.com/chainreactors/aiscan/pkg/tools/scan"
-	"github.com/chainreactors/aiscan/pkg/tools/scan/engine"
 	"github.com/chainreactors/aiscan/pkg/tui"
 	"github.com/chainreactors/aiscan/skills"
+	"github.com/chainreactors/aiscan/tools/scan"
+	"github.com/chainreactors/aiscan/tools/scan/engine"
 	ioaclient "github.com/chainreactors/ioa/client"
 	"github.com/chainreactors/ioa/protocols"
 	ioaserver "github.com/chainreactors/ioa/server"

cmd/runner/imports.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	_ "github.com/chainreactors/aiscan/pkg/tools"
-	_ "github.com/chainreactors/aiscan/pkg/tools/arsenal"
-	_ "github.com/chainreactors/aiscan/pkg/tools/gogo"
-	_ "github.com/chainreactors/aiscan/pkg/tools/neutron"
-	_ "github.com/chainreactors/aiscan/pkg/tools/proton"
-	_ "github.com/chainreactors/aiscan/pkg/tools/spray"
-	_ "github.com/chainreactors/aiscan/pkg/tools/zombie"
+	_ "github.com/chainreactors/aiscan/tools"
+	_ "github.com/chainreactors/aiscan/tools/arsenal"
+	_ "github.com/chainreactors/aiscan/tools/gogo"
+	_ "github.com/chainreactors/aiscan/tools/neutron"
+	_ "github.com/chainreactors/aiscan/tools/proton"
+	_ "github.com/chainreactors/aiscan/tools/spray"
+	_ "github.com/chainreactors/aiscan/tools/zombie"
 )

cmd/runner/main.go

@@ -15,8 +15,8 @@ import (
 	"github.com/chainreactors/aiscan/core/resources"
 	"github.com/chainreactors/aiscan/pkg/commands"
 	"github.com/chainreactors/aiscan/pkg/telemetry"
-	"github.com/chainreactors/aiscan/pkg/tools/scan/engine"
 	"github.com/chainreactors/aiscan/pkg/webagent"
+	"github.com/chainreactors/aiscan/tools/scan/engine"
 )
 
 func main() {

core/config/scanner_katana.go

@@ -2,7 +2,7 @@
 
 package config
 
-import katanacmd "github.com/chainreactors/aiscan/pkg/tools/katana"
+import katanacmd "github.com/chainreactors/aiscan/tools/katana"
 
 func init() {
 	ExtraCommands["katana"] = true

core/output/record.go

@@ -18,7 +18,6 @@ const (
 	TypeSpray     RecordType = "spray"
 	TypeZombie    RecordType = "zombie"
 	TypeNeutron   RecordType = "neutron"
-	TypeAgent     RecordType = "agent"
 	TypeScanEnd   RecordType = "scan_end"
 
 	TypeError RecordType = "error"
@@ -61,7 +60,6 @@ func (r Record) Marshal() []byte {
 	return b
 }
 
-
 func ParseRecord(line []byte) (Record, error) {
 	var r Record
 	err := json.Unmarshal(line, &r)