feat(aop): unify agent transport end to end

.github/workflows/ci.yml

@@ -253,6 +253,22 @@ jobs:
           go-version-file: go.mod
           cache: true
 
+      - name: Set up Node.js
+        if: matrix.id == 'full'
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: web/frontend/package-lock.json
+
+      - name: Build embedded frontend
+        if: matrix.id == 'full'
+        run: |
+          npm --prefix web/frontend ci
+          npm --prefix web/frontend run build
+          test -s web/static/index.html
+          test -n "$(find web/static/assets -type f -size +0c -print -quit)"
+
       - name: Generate embedded resources
         if: matrix.generate
         run: go generate ./core/resources

.github/workflows/go-release.yml

@@ -93,13 +93,13 @@ jobs:
             profile: standard
             main: ./cmd/aiscan
             binary: aiscan
-            tags: "forceposix emptytemplates noembed osusergo netgo"
+            tags: "forceposix emptytemplates noembed osusergo netgo cstx_native"
             generate: true
           - id: aiscan-full
             profile: full
             main: ./cmd/aiscan
             binary: aiscan-full
-            tags: "forceposix emptytemplates noembed osusergo netgo full sqlite"
+            tags: "forceposix emptytemplates noembed osusergo netgo full cstx_native katana_slim"
             generate: true
           - id: aiscan-agent
             profile: agent
@@ -126,6 +126,22 @@ jobs:
           go-version-file: go.mod
           cache: true
 
+      - name: Set up Node.js
+        if: matrix.profile == 'full'
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: web/frontend/package-lock.json
+
+      - name: Build embedded frontend
+        if: matrix.profile == 'full'
+        run: |
+          npm --prefix web/frontend ci
+          npm --prefix web/frontend run build
+          test -s web/static/index.html
+          test -n "$(find web/static/assets -type f -size +0c -print -quit)"
+
       - name: Generate embedded resources
         if: matrix.generate
         run: go generate ./core/resources

.github/workflows/nightly.yml

@@ -51,6 +51,13 @@ jobs:
           go-version-file: go.mod
           cache: true
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: web/frontend/package-lock.json
+
       - name: Install upx
         run: sudo apt install upx -y
         continue-on-error: true
@@ -65,6 +72,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GOPATH: "/home/runner/go"
 
+      - name: Verify embedded frontend was built
+        run: |
+          test -s web/static/index.html
+          test -n "$(find web/static/assets -type f -size +0c -print -quit)"
+
       - name: Publish release (remove draft)
         run: gh release edit "$TAG" --draft=false --prerelease
         env:

Makefile

@@ -24,7 +24,7 @@ FULL_BIN ?= $(BIN_DIR)/aiscan-full$(EXE)
 # Keep the local feature tiers aligned with the release workflow.
 STANDARD_TAGS := forceposix emptytemplates noembed osusergo netgo cstx_native $(RE2_TAGS)
 AGENT_TAGS := forceposix emptytemplates noembed osusergo netgo
-FULL_TAGS := forceposix emptytemplates noembed osusergo netgo full sqlite cstx_native katana_slim $(RE2_TAGS)
+FULL_TAGS := forceposix emptytemplates noembed osusergo netgo full cstx_native katana_slim $(RE2_TAGS)
 BUILD_FLAGS := -trimpath -buildvcs=false
 
 .PHONY: help prepare frontend standard agent full web-build web-run web all clean

cmd/agent/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"sync"
 	"syscall"
 	"time"
 
@@ -62,26 +63,39 @@ Examples:
 	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(option.Timeout)*time.Second)
 	defer cancel()
 
+	var interruptMu sync.RWMutex
 	var interruptFn func() bool
 	sigChan := make(chan os.Signal, 2)
 	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
+	defer signal.Stop(sigChan)
 	go func() {
-		for {
-			<-sigChan
-			if interruptFn != nil && interruptFn() {
+		for sig := range sigChan {
+			interruptMu.RLock()
+			fn := interruptFn
+			interruptMu.RUnlock()
+			if sig == os.Interrupt && fn != nil && fn() {
 				continue
 			}
-			fmt.Fprintf(os.Stderr, "\nPress Ctrl+C again to exit\n")
-			<-sigChan
-			os.Exit(1)
+			cancel()
+			return
 		}
 	}()
 
-	if option.WebURL != "" {
+	transport, transportErr := cfg.ResolveAgentTransport(&option)
+	if transportErr != nil {
+		logger.Errorf("agent failed: %s", transportErr)
+		os.Exit(1)
+	}
+	switch transport {
+	case cfg.AgentTransportWeb:
 		err = webagent.Run(ctx, &option, logger)
-	} else {
+	case cfg.AgentTransportStdio:
+		err = runner.RunStdio(ctx, &option, logger, os.Stdin, os.Stdout)
+	default:
 		err = runner.RunAgentMode(ctx, &option, logger, func(fn func() bool) {
+			interruptMu.Lock()
 			interruptFn = fn
+			interruptMu.Unlock()
 		})
 	}
 	if err != nil {

cmd/aiscan/cli.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/signal"
 	"slices"
@@ -54,6 +55,8 @@ type agentCommand struct {
 	cfg.ReconOptions   `group:"Recon Options"`
 }
 
+func (agentCommand) Usage() string { return "[OPTIONS]" }
+
 type serveCommand struct {
 	Token string `long:"token" description:"Access key for the server (auto-generated if empty)"`
 	Addr  string `long:"addr" default:"127.0.0.1:8765" description:"HTTP listen address"`
@@ -162,9 +165,17 @@ func aiscan() {
 	switch parsed.Mode {
 	case cfg.RunModeAgent:
 		var err error
-		if option.WebURL != "" {
+		transport, transportErr := cfg.ResolveAgentTransport(&option)
+		if transportErr != nil {
+			logger.Errorf("agent failed: %s", transportErr)
+			os.Exit(1)
+		}
+		switch transport {
+		case cfg.AgentTransportWeb:
 			err = webagent.Run(ctx, &option, logger)
-		} else {
+		case cfg.AgentTransportStdio:
+			err = runner.RunStdio(ctx, &option, logger, os.Stdin, os.Stdout)
+		default:
 			err = runner.RunAgentMode(ctx, &option, logger, sigHandler.SetStopFunc)
 		}
 		if err != nil {
@@ -728,5 +739,21 @@ func setupSignalHandler(cancel context.CancelFunc, logger telemetry.Logger) *sig
 }
 
 func printHelp(parser *goflags.Parser) {
-	parser.WriteHelp(os.Stdout)
+	writeHelp(parser, os.Stdout)
+}
+
+func writeHelp(parser *goflags.Parser, writer io.Writer) {
+	if parser.Active == nil {
+		parser.WriteHelp(writer)
+		return
+	}
+
+	// Parser.Usage contains the long root command catalog. go-flags reuses it
+	// verbatim when rendering subcommand help, which pushes the active command's
+	// flags below the fold. Keep the detailed catalog for `aiscan -h`, but use a
+	// compact root prefix for `aiscan <command> -h`.
+	rootUsage := parser.Usage
+	parser.Usage = "[GLOBAL OPTIONS]"
+	defer func() { parser.Usage = rootUsage }()
+	parser.WriteHelp(writer)
 }

cmd/aiscan/cli_test.go

@@ -15,8 +15,18 @@ import (
 	"github.com/chainreactors/aiscan/pkg/telemetry"
 	"github.com/chainreactors/aiscan/pkg/tui"
 	"github.com/chainreactors/aiscan/skills"
+	goflags "github.com/jessevdk/go-flags"
 )
 
+func containsAny(value string, candidates ...string) bool {
+	for _, candidate := range candidates {
+		if strings.Contains(value, candidate) {
+			return true
+		}
+	}
+	return false
+}
+
 type fakeConsoleProvider struct {
 	requests int
 }
@@ -144,6 +154,55 @@ func TestParseCLIAgentAcceptsLLMFlags(t *testing.T) {
 	}
 }
 
+func TestAgentHelpRendersAgentOptionsWithoutRootCatalog(t *testing.T) {
+	var cli cliOptions
+	parser := newCLIParser(&cli, parserOptionsForArgs([]string{"agent", "-h"}))
+	_, err := parser.ParseArgs([]string{"agent", "-h"})
+	flagsErr, ok := err.(*goflags.Error)
+	if !ok || flagsErr.Type != goflags.ErrHelp {
+		t.Fatalf("ParseArgs() error = %v, want ErrHelp", err)
+	}
+
+	var buf bytes.Buffer
+	writeHelp(parser, &buf)
+	help := buf.String()
+	for _, wants := range [][]string{
+		{"agent [OPTIONS]"},
+		{"Agent Options:"},
+		{"--prompt", "/prompt"},
+		{"--transport", "/transport"},
+		{"--server-url", "/server-url"},
+	} {
+		if !containsAny(help, wants...) {
+			want := strings.Join(wants, " or ")
+			t.Fatalf("agent help missing %q:\n%s", want, help)
+		}
+	}
+	if strings.Contains(help, "Advanced scanners:") || strings.Contains(help, "Server management:") {
+		t.Fatalf("agent help leaked the root command catalog:\n%s", help)
+	}
+}
+
+func TestScannerHelpRegistryUsesGeneratedFlagHelp(t *testing.T) {
+	for _, name := range []string{"scan", "gogo", "spray", "zombie", "neutron"} {
+		t.Run(name, func(t *testing.T) {
+			help, ok := cfg.StaticScannerUsage(name)
+			if !ok {
+				t.Fatalf("StaticScannerUsage(%q) was not registered", name)
+			}
+			if !strings.Contains(help, "Usage:") || !strings.Contains(help, name+" [OPTIONS]") {
+				t.Fatalf("%s help was not rendered by its go-flags parser:\n%s", name, help)
+			}
+			if !strings.Contains(help, "Help Options:") {
+				t.Fatalf("%s help is missing go-flags help options:\n%s", name, help)
+			}
+			if strings.Count(help, "\n") < 10 {
+				t.Fatalf("%s help looks like a static placeholder:\n%s", name, help)
+			}
+		})
+	}
+}
+
 func TestParseCLIScanExtractsLLMFlags(t *testing.T) {
 	parsed, err := parseCLI([]string{
 		"scan",

cmd/aiscan/setup.go

@@ -152,7 +152,7 @@ func scannerWithAgent(ctx context.Context, option *cfg.Option, application *runn
 	result, err := agent.NewAgent(rt.Config.
 		WithSystemPrompt(rt.SystemPrompt).
 		WithStream(false)).
-		Run(ctx, prompt)
+		Run(ctx, agent.TextInput(prompt))
 	if err != nil {
 		return err
 	}
@@ -171,7 +171,10 @@ func resolveScannerIntent(option *cfg.Option, store *skills.Store, command strin
 		}
 	}
 
-	intent := strings.TrimSpace(option.Prompt)
+	intent, err := cfg.ResolvePrompt(option.Prompt)
+	if err != nil {
+		return "", err
+	}
 	if intent == "" && option.TaskFile != "" {
 		data, err := os.ReadFile(option.TaskFile)
 		if err != nil {
@@ -182,7 +185,7 @@ func resolveScannerIntent(option *cfg.Option, store *skills.Store, command strin
 	if intent == "" {
 		intent = "Process the scanner output according to the user's intent. If no specific intent is provided, briefly explain the important evidence in the output."
 	}
-	intent, err := cfg.ApplySelectedSkills(intent, scan.FilterAutoSkill(option.Skills, command), store)
+	intent, err = cfg.ApplySelectedSkills(intent, scan.FilterAutoSkill(option.Skills, command), store)
 	if err != nil {
 		return "", err
 	}