mirror of
https://github.com/Ed1s0nZ/CyberStrikeAI.git
synced 2026-08-01 16:38:48 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ef8263eaf | ||
|
|
3c54a67416 | ||
|
|
98ca395edd | ||
|
|
c616822cd6 | ||
|
|
ba1796d7ce | ||
|
|
dad14c55c1 | ||
|
|
cc0233d7b4 | ||
|
|
7b6f56e476 | ||
|
|
2522fc6ae2 | ||
|
|
99d7380450 | ||
|
|
837e41459a | ||
|
|
5cbd828cad | ||
|
|
8cb317cbd6 | ||
|
|
94a2ba0406 | ||
|
|
4ee7204509 | ||
|
|
c326adbb66 | ||
|
|
7d1e9bdac4 | ||
|
|
151b445c74 |
+91
-8
@@ -4,7 +4,9 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"cyberstrike-ai/internal/app"
|
"cyberstrike-ai/internal/app"
|
||||||
"cyberstrike-ai/internal/config"
|
"cyberstrike-ai/internal/config"
|
||||||
|
"cyberstrike-ai/internal/database"
|
||||||
"cyberstrike-ai/internal/logger"
|
"cyberstrike-ai/internal/logger"
|
||||||
|
"cyberstrike-ai/internal/security"
|
||||||
"cyberstrike-ai/internal/termout"
|
"cyberstrike-ai/internal/termout"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -12,17 +14,21 @@ import (
|
|||||||
"os/signal"
|
"os/signal"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"go.uber.org/zap"
|
||||||
|
"golang.org/x/term"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var configPath = flag.String("config", "config.yaml", "配置文件路径")
|
var configPath = flag.String("config", "config.yaml", "Path to the configuration file")
|
||||||
var httpsBootstrap = flag.Bool("https", false, "启用主站 HTTPS:未配置 tls_cert_path/tls_key_path 时使用内存自签证书(本地测试);与 run.sh 默认行为一致")
|
var httpsBootstrap = flag.Bool("https", false, "Enable HTTPS for the main site; uses an in-memory self-signed certificate when no cert/key is configured")
|
||||||
var httpBootstrap = flag.Bool("http", false, "强制主站使用明文 HTTP:覆盖配置文件中的 tls_enabled/tls_auto_self_sign/tls_cert_path/tls_key_path")
|
var httpBootstrap = flag.Bool("http", false, "Force plain HTTP for the main site, overriding TLS settings in the configuration file")
|
||||||
|
var resetAdminPassword = flag.Bool("reset-admin-password", false, "Interactively reset the built-in admin password and exit")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
// 环境变量兼容(便于 systemd/docker 等不传参场景)
|
// 环境变量兼容(便于 systemd/docker 等不传参场景)
|
||||||
if *httpsBootstrap && *httpBootstrap {
|
if *httpsBootstrap && *httpBootstrap {
|
||||||
fmt.Fprintln(os.Stderr, "--http 与 --https 不能同时使用")
|
fmt.Fprintln(os.Stderr, "--http and --https cannot be used together")
|
||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
if !*httpsBootstrap && !*httpBootstrap {
|
if !*httpsBootstrap && !*httpBootstrap {
|
||||||
@@ -38,24 +44,32 @@ func main() {
|
|||||||
cp = "config.yaml"
|
cp = "config.yaml"
|
||||||
}
|
}
|
||||||
if strings.HasPrefix(cp, "-") {
|
if strings.HasPrefix(cp, "-") {
|
||||||
fmt.Fprintf(os.Stderr, "无效的 -config 路径 %q。\n若同时需要 HTTPS,请写成: ./cyberstrike-ai --https -config config.yaml(-config 后必须是 yaml 文件路径)。\n", cp)
|
fmt.Fprintf(os.Stderr, "Invalid -config path %q.\nIf HTTPS is also needed, use: ./cyberstrike-ai --https -config config.yaml (-config must be followed by a yaml file path).\n", cp)
|
||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
localConfig, err := config.EnsureLocalConfig(cp)
|
localConfig, err := config.EnsureLocalConfig(cp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("加载配置失败: %v\n", err)
|
fmt.Printf("Failed to load config: %v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg, err := config.Load(cp)
|
cfg, err := config.Load(cp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("加载配置失败: %v\n", err)
|
fmt.Printf("Failed to load config: %v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if localConfig.Created {
|
if localConfig.Created {
|
||||||
termout.PrintConfigCreated()
|
termout.PrintConfigCreated()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if *resetAdminPassword {
|
||||||
|
if err := runResetAdminPassword(cfg); err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, "Failed to reset admin password: %v\n", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if *httpBootstrap {
|
if *httpBootstrap {
|
||||||
config.ApplyPlainHTTPBootstrap(cfg)
|
config.ApplyPlainHTTPBootstrap(cfg)
|
||||||
} else if *httpsBootstrap {
|
} else if *httpsBootstrap {
|
||||||
@@ -79,7 +93,7 @@ func main() {
|
|||||||
|
|
||||||
// MCP 启用且 auth_header_value 为空时,自动生成随机密钥并写回配置
|
// MCP 启用且 auth_header_value 为空时,自动生成随机密钥并写回配置
|
||||||
if err := config.EnsureMCPAuth(cp, cfg); err != nil {
|
if err := config.EnsureMCPAuth(cp, cfg); err != nil {
|
||||||
fmt.Printf("MCP 鉴权配置失败: %v\n", err)
|
fmt.Printf("Failed to configure MCP authentication: %v\n", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if cfg.MCP.Enabled {
|
if cfg.MCP.Enabled {
|
||||||
@@ -121,3 +135,72 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func runResetAdminPassword(cfg *config.Config) error {
|
||||||
|
dbPath := strings.TrimSpace(cfg.Database.Path)
|
||||||
|
if dbPath == "" {
|
||||||
|
dbPath = "data/conversations.db"
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(dbPath); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return fmt.Errorf("database does not exist: %s; start the service once to initialize it first", dbPath)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Reset built-in admin password")
|
||||||
|
fmt.Println()
|
||||||
|
|
||||||
|
password, err := readHiddenPassword("New admin password: ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
password = strings.TrimSpace(password)
|
||||||
|
if len(password) < 8 {
|
||||||
|
return fmt.Errorf("new password must be at least 8 characters")
|
||||||
|
}
|
||||||
|
confirm, err := readHiddenPassword("Confirm new password: ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if password != strings.TrimSpace(confirm) {
|
||||||
|
return fmt.Errorf("passwords do not match")
|
||||||
|
}
|
||||||
|
|
||||||
|
hash, err := security.HashPassword(password)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
db, err := database.NewDB(dbPath, zap.NewNop())
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() { _ = db.Close() }()
|
||||||
|
|
||||||
|
admin, err := db.GetRBACUserByUsername("admin")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("built-in admin account was not found; start the service once to initialize it first: %w", err)
|
||||||
|
}
|
||||||
|
if !admin.IsBuiltin {
|
||||||
|
return fmt.Errorf("admin account is not built in; refusing to reset it")
|
||||||
|
}
|
||||||
|
if err := db.UpdateRBACAdminPassword(hash); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println()
|
||||||
|
fmt.Println("Admin password has been reset.")
|
||||||
|
fmt.Println("If the service is running, existing login sessions remain valid until the service restarts or the sessions expire.")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func readHiddenPassword(prompt string) (string, error) {
|
||||||
|
fmt.Fprint(os.Stderr, prompt)
|
||||||
|
password, err := term.ReadPassword(int(os.Stdin.Fd()))
|
||||||
|
fmt.Fprintln(os.Stderr)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return string(password), nil
|
||||||
|
}
|
||||||
|
|||||||
+2
-2
@@ -10,7 +10,7 @@
|
|||||||
# ============================================
|
# ============================================
|
||||||
|
|
||||||
# 前端显示的版本号(可选,不填则显示默认版本)
|
# 前端显示的版本号(可选,不填则显示默认版本)
|
||||||
version: "v1.7.9"
|
version: "v1.7.10"
|
||||||
# 服务器配置
|
# 服务器配置
|
||||||
server:
|
server:
|
||||||
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
host: 0.0.0.0 # 监听地址,0.0.0.0 表示监听所有网络接口
|
||||||
@@ -68,7 +68,7 @@ ai:
|
|||||||
api_key: sk-xxxxxxx
|
api_key: sk-xxxxxxx
|
||||||
model: qwen3-max
|
model: qwen3-max
|
||||||
max_total_tokens: 120000
|
max_total_tokens: 120000
|
||||||
max_completion_tokens: 16384
|
max_completion_tokens: 32768
|
||||||
# Eino 路径模型推理:DeepSeek/OpenAI 为 thinking / reasoning_effort;Claude 4.6+ 为 adaptive + output_config.effort(仅显式配置 effort 时下发);3.7 为 enabled+budget_tokens:10000(文档示例),effort 不映射,自定义预算用 extra_request_fields
|
# Eino 路径模型推理:DeepSeek/OpenAI 为 thinking / reasoning_effort;Claude 4.6+ 为 adaptive + output_config.effort(仅显式配置 effort 时下发);3.7 为 enabled+budget_tokens:10000(文档示例),effort 不映射,自定义预算用 extra_request_fields
|
||||||
reasoning:
|
reasoning:
|
||||||
mode: on # auto | on | off;off:OpenAI/Claude 不附加推理字段,DeepSeek 发送 thinking.type=disabled(其默认开启思考)
|
mode: on # auto | on | off;off:OpenAI/Claude 不附加推理字段,DeepSeek 发送 thinking.type=disabled(其默认开启思考)
|
||||||
|
|||||||
@@ -46,13 +46,21 @@ Login fails:
|
|||||||
|
|
||||||
If another administrator with `rbac:write` is available, reset the password under **Platform permissions → User management**.
|
If another administrator with `rbac:write` is available, reset the password under **Platform permissions → User management**.
|
||||||
|
|
||||||
If no administrator session is available, the built-in `admin` account can be recovered on the server. Stop CyberStrikeAI, back up the database, change to the project root, and run the command below. Enter and confirm the new password when prompted:
|
If no administrator session is available, the built-in `admin` account can be recovered on the server. Change to the project root and run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./run.sh --reset-admin-password
|
||||||
|
```
|
||||||
|
|
||||||
|
Enter and confirm the new password when prompted. The script hides input and stores a bcrypt hash. If the service is running, restart it afterward to invalidate existing login sessions.
|
||||||
|
|
||||||
|
If `run.sh` is not available, run the command below manually. Enter and confirm the new password when prompted:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
HASH=$(htpasswd -nBC 10 '' | cut -d: -f2 | tr -d '\n') && sqlite3 data/conversations.db "UPDATE rbac_users SET password_hash='$HASH', updated_at=CURRENT_TIMESTAMP WHERE id='admin' AND username='admin' AND is_builtin=1; SELECT changes();"
|
HASH=$(htpasswd -nBC 10 '' | cut -d: -f2 | tr -d '\n') && sqlite3 data/conversations.db "UPDATE rbac_users SET password_hash='$HASH', updated_at=CURRENT_TIMESTAMP WHERE id='admin' AND username='admin' AND is_builtin=1; SELECT changes();"
|
||||||
```
|
```
|
||||||
|
|
||||||
Output `1` means that the row was updated. The command requires `sqlite3` and `htpasswd`. If `database.path` in `config.yaml` is not the default, replace `data/conversations.db`. Password input is hidden, is not written to shell history, and is stored as a bcrypt hash. Restart the service afterward to invalidate existing login sessions.
|
Output `1` means that the row was updated. The command requires `sqlite3` and `htpasswd`. If `database.path` in `config.yaml` is not the default, replace `data/conversations.db`. Password input is hidden and is not written to shell history.
|
||||||
|
|
||||||
Model fails:
|
Model fails:
|
||||||
|
|
||||||
|
|||||||
@@ -32,13 +32,21 @@ https://127.0.0.1:8080/
|
|||||||
|
|
||||||
如果仍有其他具备 `rbac:write` 权限的管理员账号,优先在 **平台权限 → 用户管理** 中重置密码。
|
如果仍有其他具备 `rbac:write` 权限的管理员账号,优先在 **平台权限 → 用户管理** 中重置密码。
|
||||||
|
|
||||||
如果没有可用的管理员会话,可在服务器上紧急重置内置 `admin` 账号。先停止 CyberStrikeAI 服务并备份数据库,然后在项目根目录执行以下命令,按提示输入并确认新密码:
|
如果没有可用的管理员会话,可在服务器上紧急重置内置 `admin` 账号。在项目根目录执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./run.sh --reset-admin-password
|
||||||
|
```
|
||||||
|
|
||||||
|
按提示输入并确认新密码。脚本会隐藏输入并写入 bcrypt 哈希。如果服务正在运行,完成后重新启动服务,使原有登录会话失效。
|
||||||
|
|
||||||
|
如果无法使用 `run.sh`,也可以手动执行以下命令,按提示输入并确认新密码:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
HASH=$(htpasswd -nBC 10 '' | cut -d: -f2 | tr -d '\n') && sqlite3 data/conversations.db "UPDATE rbac_users SET password_hash='$HASH', updated_at=CURRENT_TIMESTAMP WHERE id='admin' AND username='admin' AND is_builtin=1; SELECT changes();"
|
HASH=$(htpasswd -nBC 10 '' | cut -d: -f2 | tr -d '\n') && sqlite3 data/conversations.db "UPDATE rbac_users SET password_hash='$HASH', updated_at=CURRENT_TIMESTAMP WHERE id='admin' AND username='admin' AND is_builtin=1; SELECT changes();"
|
||||||
```
|
```
|
||||||
|
|
||||||
输出 `1` 表示修改成功。该命令需要 `sqlite3` 和 `htpasswd`;如果 `config.yaml` 中的 `database.path` 不是默认值,请替换 `data/conversations.db`。密码输入不会显示,也不会写入 Shell 历史,并以 bcrypt 哈希保存。完成后重新启动服务,使原有登录会话失效。
|
输出 `1` 表示修改成功。该命令需要 `sqlite3` 和 `htpasswd`;如果 `config.yaml` 中的 `database.path` 不是默认值,请替换 `data/conversations.db`。密码输入不会显示,也不会写入 Shell 历史。
|
||||||
|
|
||||||
## 模型无响应
|
## 模型无响应
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ require (
|
|||||||
go.opentelemetry.io/otel/trace v1.34.0
|
go.opentelemetry.io/otel/trace v1.34.0
|
||||||
go.uber.org/zap v1.26.0
|
go.uber.org/zap v1.26.0
|
||||||
golang.org/x/net v0.35.0
|
golang.org/x/net v0.35.0
|
||||||
|
golang.org/x/term v0.32.0
|
||||||
golang.org/x/text v0.26.0
|
golang.org/x/text v0.26.0
|
||||||
golang.org/x/time v0.14.0
|
golang.org/x/time v0.14.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
|
|||||||
+14
-22
@@ -514,6 +514,14 @@ type ToolExecutionResult struct {
|
|||||||
IsError bool
|
IsError bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildToolFailureMessage(toolName, detail string, err error) string {
|
||||||
|
var b strings.Builder
|
||||||
|
fmt.Fprintf(&b, "工具调用失败\n\n")
|
||||||
|
fmt.Fprintf(&b, "工具名称: %s\n", toolName)
|
||||||
|
fmt.Fprintf(&b, "错误详情: %s", detail)
|
||||||
|
return strings.TrimRight(b.String(), "\n")
|
||||||
|
}
|
||||||
|
|
||||||
// executeToolViaMCP 通过MCP执行工具
|
// executeToolViaMCP 通过MCP执行工具
|
||||||
// 即使工具执行失败,也返回结果而不是错误,让AI能够处理错误情况
|
// 即使工具执行失败,也返回结果而不是错误,让AI能够处理错误情况
|
||||||
func (a *Agent) executeToolViaMCP(ctx context.Context, toolName string, args map[string]interface{}) (*ToolExecutionResult, error) {
|
func (a *Agent) executeToolViaMCP(ctx context.Context, toolName string, args map[string]interface{}) (*ToolExecutionResult, error) {
|
||||||
@@ -573,32 +581,16 @@ func (a *Agent) executeToolViaMCP(ctx context.Context, toolName string, args map
|
|||||||
// 如果调用失败(如工具不存在、超时),返回友好的错误信息而不是抛出异常
|
// 如果调用失败(如工具不存在、超时),返回友好的错误信息而不是抛出异常
|
||||||
if err != nil {
|
if err != nil {
|
||||||
detail := err.Error()
|
detail := err.Error()
|
||||||
|
timeoutMinutes := 10
|
||||||
|
if a.agentConfig != nil && a.agentConfig.ToolTimeoutMinutes > 0 {
|
||||||
|
timeoutMinutes = a.agentConfig.ToolTimeoutMinutes
|
||||||
|
}
|
||||||
if errors.Is(err, context.Canceled) {
|
if errors.Is(err, context.Canceled) {
|
||||||
detail = "工具调用已被手动终止(MCP 监控页)。智能体将携带此结果继续后续步骤,整条任务不会因此被停止。"
|
detail = "工具调用已被手动终止(MCP 监控页)。智能体将携带此结果继续后续步骤,整条任务不会因此被停止。"
|
||||||
} else if errors.Is(err, context.DeadlineExceeded) {
|
} else if errors.Is(err, context.DeadlineExceeded) {
|
||||||
min := 10
|
detail = fmt.Sprintf("工具执行超过 %d 分钟被自动终止(可在 config.yaml 的 agent.tool_timeout_minutes 中调整)", timeoutMinutes)
|
||||||
if a.agentConfig != nil && a.agentConfig.ToolTimeoutMinutes > 0 {
|
|
||||||
min = a.agentConfig.ToolTimeoutMinutes
|
|
||||||
}
|
|
||||||
detail = fmt.Sprintf("工具执行超过 %d 分钟被自动终止(可在 config.yaml 的 agent.tool_timeout_minutes 中调整)", min)
|
|
||||||
}
|
}
|
||||||
errorMsg := fmt.Sprintf(`工具调用失败
|
errorMsg := buildToolFailureMessage(toolName, detail, err)
|
||||||
|
|
||||||
工具名称: %s
|
|
||||||
错误类型: 系统错误
|
|
||||||
错误详情: %s
|
|
||||||
|
|
||||||
可能的原因:
|
|
||||||
- 工具 "%s" 不存在或未启用
|
|
||||||
- 单次执行超时(agent.tool_timeout_minutes)
|
|
||||||
- 系统配置问题
|
|
||||||
- 网络或权限问题
|
|
||||||
|
|
||||||
建议:
|
|
||||||
- 检查工具名称是否正确
|
|
||||||
- 若需更长执行时间,可适当增大 agent.tool_timeout_minutes
|
|
||||||
- 尝试使用其他替代工具
|
|
||||||
- 如果这是必需的工具,请向用户说明情况`, toolName, detail, toolName)
|
|
||||||
|
|
||||||
return &ToolExecutionResult{
|
return &ToolExecutionResult{
|
||||||
Result: errorMsg,
|
Result: errorMsg,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package agent
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -71,6 +72,80 @@ func TestAgent_NewAgent_CustomConfig(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestBuildToolFailureMessageAuthorizationDenied(t *testing.T) {
|
||||||
|
msg := buildToolFailureMessage(
|
||||||
|
"list_project_facts",
|
||||||
|
"tool authorization denied: no access to project",
|
||||||
|
errors.New("tool authorization denied: no access to project"),
|
||||||
|
)
|
||||||
|
for _, want := range []string{
|
||||||
|
"工具名称: list_project_facts",
|
||||||
|
"错误详情: tool authorization denied: no access to project",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(msg, want) {
|
||||||
|
t.Fatalf("message missing %q:\n%s", want, msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, notWant := range []string{
|
||||||
|
"可能的原因",
|
||||||
|
"建议",
|
||||||
|
"错误类型",
|
||||||
|
"工具 \"list_project_facts\" 不存在或未启用",
|
||||||
|
"单次执行超时",
|
||||||
|
} {
|
||||||
|
if strings.Contains(msg, notWant) {
|
||||||
|
t.Fatalf("message should not include generic hint %q:\n%s", notWant, msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildToolFailureMessageCanceled(t *testing.T) {
|
||||||
|
msg := buildToolFailureMessage(
|
||||||
|
"long_running_tool",
|
||||||
|
"工具调用已被手动终止(MCP 监控页)。智能体将携带此结果继续后续步骤,整条任务不会因此被停止。",
|
||||||
|
context.Canceled,
|
||||||
|
)
|
||||||
|
|
||||||
|
for _, want := range []string{
|
||||||
|
"工具名称: long_running_tool",
|
||||||
|
"错误详情: 工具调用已被手动终止",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(msg, want) {
|
||||||
|
t.Fatalf("message missing %q:\n%s", want, msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildToolFailureMessageDeadlineExceeded(t *testing.T) {
|
||||||
|
msg := buildToolFailureMessage(
|
||||||
|
"nmap",
|
||||||
|
"工具执行超过 15 分钟被自动终止(可在 config.yaml 的 agent.tool_timeout_minutes 中调整)",
|
||||||
|
context.DeadlineExceeded,
|
||||||
|
)
|
||||||
|
|
||||||
|
for _, want := range []string{
|
||||||
|
"工具名称: nmap",
|
||||||
|
"错误详情: 工具执行超过 15 分钟被自动终止",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(msg, want) {
|
||||||
|
t.Fatalf("message missing %q:\n%s", want, msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildToolFailureMessageUnknownKeepsGenericFallback(t *testing.T) {
|
||||||
|
msg := buildToolFailureMessage("custom_tool", "dial tcp: connection reset by peer", errors.New("dial tcp: connection reset by peer"))
|
||||||
|
|
||||||
|
for _, want := range []string{
|
||||||
|
"工具名称: custom_tool",
|
||||||
|
"错误详情: dial tcp: connection reset by peer",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(msg, want) {
|
||||||
|
t.Fatalf("message missing %q:\n%s", want, msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestAgentCancelRunningMCPToolsForConversation(t *testing.T) {
|
func TestAgentCancelRunningMCPToolsForConversation(t *testing.T) {
|
||||||
ag := setupTestAgent(t)
|
ag := setupTestAgent(t)
|
||||||
ag.mcpServer.ConfigureToolWaitTimeoutSeconds(1)
|
ag.mcpServer.ConfigureToolWaitTimeoutSeconds(1)
|
||||||
|
|||||||
@@ -382,7 +382,13 @@ func authorizeProjectTool(ctx context.Context, principal authctx.Principal, db *
|
|||||||
return fmt.Errorf("no access to conversation %s", conversationID)
|
return fmt.Errorf("no access to conversation %s", conversationID)
|
||||||
}
|
}
|
||||||
projectID, err := db.GetConversationProjectID(conversationID)
|
projectID, err := db.GetConversationProjectID(conversationID)
|
||||||
if err != nil || strings.TrimSpace(projectID) == "" || !db.UserCanAccessResource(principal.UserID, principal.ScopeFor(permission), "project", projectID) {
|
if err != nil {
|
||||||
|
return fmt.Errorf("no access to project: %w", err)
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(projectID) == "" {
|
||||||
|
return fmt.Errorf("当前对话未绑定项目,无法使用项目黑板工具,请先在对话中选择项目或创建带项目的对话")
|
||||||
|
}
|
||||||
|
if !db.UserCanAccessResource(principal.UserID, principal.ScopeFor(permission), "project", projectID) {
|
||||||
return fmt.Errorf("no access to project %s", projectID)
|
return fmt.Errorf("no access to project %s", projectID)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -1424,7 +1424,8 @@ func (db *DB) GetProcessDetailsSummary(messageID string) (*ProcessDetailsSummary
|
|||||||
seenExecIDs := make(map[string]bool)
|
seenExecIDs := make(map[string]bool)
|
||||||
// A provider may reuse a fallback toolCallId across streaming rounds. Keep a
|
// A provider may reuse a fallback toolCallId across streaming rounds. Keep a
|
||||||
// FIFO per ID instead of a single index so every persisted call gets at most
|
// FIFO per ID instead of a single index so every persisted call gets at most
|
||||||
// one result. Results without an ID fall back to the oldest unmatched call.
|
// one result. Results without a stable ID are kept separate instead of being
|
||||||
|
// guessed by order; showing no link is safer than linking to the wrong tool.
|
||||||
toolIndexesByCallID := make(map[string][]int)
|
toolIndexesByCallID := make(map[string][]int)
|
||||||
lastMatchedToolIndexByCallID := make(map[string]int)
|
lastMatchedToolIndexByCallID := make(map[string]int)
|
||||||
matchedToolIndexes := make([]bool, 0)
|
matchedToolIndexes := make([]bool, 0)
|
||||||
@@ -1499,7 +1500,7 @@ func (db *DB) GetProcessDetailsSummary(messageID string) (*ProcessDetailsSummary
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if idx < 0 {
|
if idx < 0 && toolCallID != "" {
|
||||||
for nextUnmatchedToolIdx < len(matchedToolIndexes) && matchedToolIndexes[nextUnmatchedToolIdx] {
|
for nextUnmatchedToolIdx < len(matchedToolIndexes) && matchedToolIndexes[nextUnmatchedToolIdx] {
|
||||||
nextUnmatchedToolIdx++
|
nextUnmatchedToolIdx++
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestProcessDetailsSummaryPairsMixedIdentifiedAndIDLessResults(t *testing.T) {
|
func TestProcessDetailsSummaryDoesNotGuessIDLessResultsByOrder(t *testing.T) {
|
||||||
db, conversationID, messageID := setupProcessDetailsSummaryTest(t)
|
db, conversationID, messageID := setupProcessDetailsSummaryTest(t)
|
||||||
for _, id := range []string{"call-1", "call-2", "call-3", "call-4"} {
|
for _, id := range []string{"call-1", "call-2", "call-3", "call-4"} {
|
||||||
if err := db.AddProcessDetail(messageID, conversationID, "tool_call", "call", map[string]interface{}{
|
if err := db.AddProcessDetail(messageID, conversationID, "tool_call", "call", map[string]interface{}{
|
||||||
@@ -32,14 +32,24 @@ func TestProcessDetailsSummaryPairsMixedIdentifiedAndIDLessResults(t *testing.T)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("GetProcessDetailsSummary: %v", err)
|
t.Fatalf("GetProcessDetailsSummary: %v", err)
|
||||||
}
|
}
|
||||||
if len(summary.ToolExecutions) != 4 {
|
if len(summary.ToolExecutions) != 6 {
|
||||||
t.Fatalf("tool executions = %d, want 4", len(summary.ToolExecutions))
|
t.Fatalf("tool executions = %d, want 6", len(summary.ToolExecutions))
|
||||||
}
|
}
|
||||||
for i, execution := range summary.ToolExecutions {
|
for i, execution := range summary.ToolExecutions[:2] {
|
||||||
if execution.Status != "completed" {
|
if execution.Status != "completed" {
|
||||||
t.Fatalf("execution %d status = %q, want completed", i, execution.Status)
|
t.Fatalf("execution %d status = %q, want completed", i, execution.Status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for i, execution := range summary.ToolExecutions[2:4] {
|
||||||
|
if execution.Status != "result_missing" {
|
||||||
|
t.Fatalf("unmatched call %d status = %q, want result_missing", i, execution.Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for i, execution := range summary.ToolExecutions[4:] {
|
||||||
|
if execution.Status != "completed" || execution.ToolCallID != "" {
|
||||||
|
t.Fatalf("idless result %d = %#v, want separate completed result without toolCallId", i, execution)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProcessDetailsSummaryPairsRepeatedToolCallIDsFIFO(t *testing.T) {
|
func TestProcessDetailsSummaryPairsRepeatedToolCallIDsFIFO(t *testing.T) {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
var factKeyPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9._/-]*$`)
|
var factKeyPattern = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9._/-]*$`)
|
||||||
|
|
||||||
// ValidateFactKey 校验事实 key(项目内唯一标识)。
|
// ValidateFactKey 校验事实 key(项目内唯一标识)。
|
||||||
func ValidateFactKey(key string) error {
|
func ValidateFactKey(key string) error {
|
||||||
@@ -22,7 +22,7 @@ func ValidateFactKey(key string) error {
|
|||||||
return fmt.Errorf("fact_key 过长(最多 128 字符)")
|
return fmt.Errorf("fact_key 过长(最多 128 字符)")
|
||||||
}
|
}
|
||||||
if !factKeyPattern.MatchString(key) {
|
if !factKeyPattern.MatchString(key) {
|
||||||
return fmt.Errorf("fact_key 格式无效,仅允许小写字母、数字及 . _ / -,且须以小写字母或数字开头")
|
return fmt.Errorf("fact_key 格式无效,仅允许字母、数字及 . _ / -,且须以字母或数字开头(支持驼峰命名)")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -674,48 +674,6 @@ func (m *ExternalMCPManager) updateToolCache(name string, tools []Tool) {
|
|||||||
|
|
||||||
// CallTool 调用外部MCP工具(返回执行ID)
|
// CallTool 调用外部MCP工具(返回执行ID)
|
||||||
func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
||||||
_, authenticated := authctx.PrincipalFromContext(ctx)
|
|
||||||
m.mu.RLock()
|
|
||||||
authorizer := m.toolAuthorizer
|
|
||||||
m.mu.RUnlock()
|
|
||||||
if authorizer != nil {
|
|
||||||
if err := authorizer(ctx, toolName, args); err != nil {
|
|
||||||
return nil, "", fmt.Errorf("external tool authorization denied: %w", err)
|
|
||||||
}
|
|
||||||
} else if authenticated {
|
|
||||||
return nil, "", fmt.Errorf("external tool authorization policy is not configured")
|
|
||||||
}
|
|
||||||
// 解析工具名称:name::toolName
|
|
||||||
var mcpName, actualToolName string
|
|
||||||
if idx := findSubstring(toolName, "::"); idx > 0 {
|
|
||||||
mcpName = toolName[:idx]
|
|
||||||
actualToolName = toolName[idx+2:]
|
|
||||||
} else {
|
|
||||||
return nil, "", fmt.Errorf("无效的工具名称格式: %s", toolName)
|
|
||||||
}
|
|
||||||
|
|
||||||
client, exists := m.GetClient(mcpName)
|
|
||||||
if !exists {
|
|
||||||
return nil, "", fmt.Errorf("外部MCP客户端不存在: %s", mcpName)
|
|
||||||
}
|
|
||||||
if err := m.checkExternalMCPCircuit(mcpName); err != nil {
|
|
||||||
return nil, "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查连接状态,如果未连接或状态为error,不允许调用
|
|
||||||
if !client.IsConnected() {
|
|
||||||
status := client.GetStatus()
|
|
||||||
if status == "error" {
|
|
||||||
// 获取错误信息(如果有)
|
|
||||||
errorMsg := m.GetError(mcpName)
|
|
||||||
if errorMsg != "" {
|
|
||||||
return nil, "", fmt.Errorf("外部MCP连接失败: %s (错误: %s)", mcpName, errorMsg)
|
|
||||||
}
|
|
||||||
return nil, "", fmt.Errorf("外部MCP连接失败: %s", mcpName)
|
|
||||||
}
|
|
||||||
return nil, "", fmt.Errorf("外部MCP客户端未连接: %s (状态: %s)", mcpName, status)
|
|
||||||
}
|
|
||||||
|
|
||||||
if m.executionService == nil {
|
if m.executionService == nil {
|
||||||
m.executionService = NewExecutionService(m.storage, m.logger)
|
m.executionService = NewExecutionService(m.storage, m.logger)
|
||||||
m.executionService.ConfigureToolResultMaxBytes(m.toolResultMaxBytes)
|
m.executionService.ConfigureToolResultMaxBytes(m.toolResultMaxBytes)
|
||||||
@@ -725,12 +683,57 @@ func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args
|
|||||||
if principal, ok := authctx.PrincipalFromContext(ctx); ok {
|
if principal, ok := authctx.PrincipalFromContext(ctx); ok {
|
||||||
ownerUserID = principal.UserID
|
ownerUserID = principal.UserID
|
||||||
}
|
}
|
||||||
|
var mcpName, actualToolName string
|
||||||
|
var client ExternalMCPClient
|
||||||
handle, err := m.executionService.Submit(ctx, ExecutionRequest{
|
handle, err := m.executionService.Submit(ctx, ExecutionRequest{
|
||||||
ToolName: toolName,
|
ToolName: toolName,
|
||||||
Arguments: args,
|
Arguments: args,
|
||||||
ConversationID: MCPConversationIDFromContext(ctx),
|
ConversationID: MCPConversationIDFromContext(ctx),
|
||||||
OwnerUserID: ownerUserID,
|
OwnerUserID: ownerUserID,
|
||||||
PreRun: func(runCtx context.Context, exec *ToolExecution) (func(), error) {
|
PreRun: func(runCtx context.Context, exec *ToolExecution) (func(), error) {
|
||||||
|
_, authenticated := authctx.PrincipalFromContext(runCtx)
|
||||||
|
m.mu.RLock()
|
||||||
|
authorizer := m.toolAuthorizer
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if authorizer != nil {
|
||||||
|
if err := authorizer(runCtx, toolName, args); err != nil {
|
||||||
|
return nil, fmt.Errorf("external tool authorization denied: %w", err)
|
||||||
|
}
|
||||||
|
} else if authenticated {
|
||||||
|
return nil, fmt.Errorf("external tool authorization policy is not configured")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析工具名称:name::toolName
|
||||||
|
if idx := findSubstring(toolName, "::"); idx > 0 {
|
||||||
|
mcpName = toolName[:idx]
|
||||||
|
actualToolName = toolName[idx+2:]
|
||||||
|
} else {
|
||||||
|
return nil, fmt.Errorf("无效的工具名称格式: %s", toolName)
|
||||||
|
}
|
||||||
|
|
||||||
|
var exists bool
|
||||||
|
client, exists = m.GetClient(mcpName)
|
||||||
|
if !exists {
|
||||||
|
return nil, fmt.Errorf("外部MCP客户端不存在: %s", mcpName)
|
||||||
|
}
|
||||||
|
if err := m.checkExternalMCPCircuit(mcpName); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查连接状态,如果未连接或状态为error,不允许调用
|
||||||
|
if !client.IsConnected() {
|
||||||
|
status := client.GetStatus()
|
||||||
|
if status == "error" {
|
||||||
|
// 获取错误信息(如果有)
|
||||||
|
errorMsg := m.GetError(mcpName)
|
||||||
|
if errorMsg != "" {
|
||||||
|
return nil, fmt.Errorf("外部MCP连接失败: %s (错误: %s)", mcpName, errorMsg)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("外部MCP连接失败: %s", mcpName)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("外部MCP客户端未连接: %s (状态: %s)", mcpName, status)
|
||||||
|
}
|
||||||
|
|
||||||
release, acquireErr := m.acquireExternalMCPCallSlot(runCtx, mcpName)
|
release, acquireErr := m.acquireExternalMCPCallSlot(runCtx, mcpName)
|
||||||
if acquireErr != nil {
|
if acquireErr != nil {
|
||||||
return nil, acquireErr
|
return nil, acquireErr
|
||||||
@@ -746,7 +749,9 @@ func (m *ExternalMCPManager) CallTool(ctx context.Context, toolName string, args
|
|||||||
},
|
},
|
||||||
OnDone: func(exec *ToolExecution) {
|
OnDone: func(exec *ToolExecution) {
|
||||||
failed := exec != nil && exec.Status != ToolExecutionStatusCompleted && exec.Status != ToolExecutionStatusCancelled
|
failed := exec != nil && exec.Status != ToolExecutionStatusCompleted && exec.Status != ToolExecutionStatusCancelled
|
||||||
m.recordExternalMCPResult(mcpName, failed)
|
if mcpName != "" {
|
||||||
|
m.recordExternalMCPResult(mcpName, failed)
|
||||||
|
}
|
||||||
m.updateStats(toolName, failed)
|
m.updateStats(toolName, failed)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -20,10 +20,20 @@ func TestExternalManagerEnforcesConfiguredAuthorizer(t *testing.T) {
|
|||||||
return errors.New("denied by policy")
|
return errors.New("denied by policy")
|
||||||
})
|
})
|
||||||
ctx := authctx.WithPrincipal(context.Background(), authctx.NewPrincipal("u1", "user", "assigned", map[string]bool{"agent:execute": true}))
|
ctx := authctx.WithPrincipal(context.Background(), authctx.NewPrincipal("u1", "user", "assigned", map[string]bool{"agent:execute": true}))
|
||||||
_, _, err := manager.CallTool(ctx, "server::tool", map[string]interface{}{})
|
_, executionID, err := manager.CallTool(ctx, "server::tool", map[string]interface{}{})
|
||||||
if err == nil || !strings.Contains(err.Error(), "authorization denied") {
|
if err == nil || !strings.Contains(err.Error(), "authorization denied") {
|
||||||
t.Fatalf("external call bypassed authorizer: %v", err)
|
t.Fatalf("external call bypassed authorizer: %v", err)
|
||||||
}
|
}
|
||||||
|
if executionID == "" {
|
||||||
|
t.Fatal("denied external call should still return an execution id")
|
||||||
|
}
|
||||||
|
execution, ok := manager.GetExecution(executionID)
|
||||||
|
if !ok || execution == nil {
|
||||||
|
t.Fatalf("missing denied external execution %q", executionID)
|
||||||
|
}
|
||||||
|
if execution.Status != ToolExecutionStatusFailed || !strings.Contains(execution.Error, "denied by policy") {
|
||||||
|
t.Fatalf("denied external execution = %#v, want failed with policy error", execution)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestExternalMCPManager_AddOrUpdateConfig(t *testing.T) {
|
func TestExternalMCPManager_AddOrUpdateConfig(t *testing.T) {
|
||||||
|
|||||||
+15
-19
@@ -895,25 +895,6 @@ func (s *Server) GetAllTools() []Tool {
|
|||||||
|
|
||||||
// CallTool 直接调用工具(用于内部调用)
|
// CallTool 直接调用工具(用于内部调用)
|
||||||
func (s *Server) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
func (s *Server) CallTool(ctx context.Context, toolName string, args map[string]interface{}) (*ToolResult, string, error) {
|
||||||
_, authenticated := authctx.PrincipalFromContext(ctx)
|
|
||||||
s.mu.RLock()
|
|
||||||
authorizer := s.toolAuthorizer
|
|
||||||
s.mu.RUnlock()
|
|
||||||
if authorizer != nil {
|
|
||||||
if err := authorizer(ctx, toolName, args); err != nil {
|
|
||||||
return nil, "", fmt.Errorf("tool authorization denied: %w", err)
|
|
||||||
}
|
|
||||||
} else if authenticated {
|
|
||||||
return nil, "", errors.New("tool authorization policy is not configured")
|
|
||||||
}
|
|
||||||
s.mu.RLock()
|
|
||||||
handler, exists := s.tools[toolName]
|
|
||||||
s.mu.RUnlock()
|
|
||||||
|
|
||||||
if !exists {
|
|
||||||
return nil, "", fmt.Errorf("工具 %s 未找到", toolName)
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.executionService == nil {
|
if s.executionService == nil {
|
||||||
s.executionService = NewExecutionService(s.storage, s.logger)
|
s.executionService = NewExecutionService(s.storage, s.logger)
|
||||||
s.executionService.ConfigureToolResultMaxBytes(s.toolResultMaxBytes)
|
s.executionService.ConfigureToolResultMaxBytes(s.toolResultMaxBytes)
|
||||||
@@ -929,6 +910,21 @@ func (s *Server) CallTool(ctx context.Context, toolName string, args map[string]
|
|||||||
ConversationID: MCPConversationIDFromContext(ctx),
|
ConversationID: MCPConversationIDFromContext(ctx),
|
||||||
OwnerUserID: ownerUserID,
|
OwnerUserID: ownerUserID,
|
||||||
Run: func(runCtx context.Context) (*ToolResult, error) {
|
Run: func(runCtx context.Context) (*ToolResult, error) {
|
||||||
|
_, authenticated := authctx.PrincipalFromContext(runCtx)
|
||||||
|
s.mu.RLock()
|
||||||
|
authorizer := s.toolAuthorizer
|
||||||
|
handler, exists := s.tools[toolName]
|
||||||
|
s.mu.RUnlock()
|
||||||
|
if authorizer != nil {
|
||||||
|
if err := authorizer(runCtx, toolName, args); err != nil {
|
||||||
|
return nil, fmt.Errorf("tool authorization denied: %w", err)
|
||||||
|
}
|
||||||
|
} else if authenticated {
|
||||||
|
return nil, errors.New("tool authorization policy is not configured")
|
||||||
|
}
|
||||||
|
if !exists {
|
||||||
|
return nil, fmt.Errorf("工具 %s 未找到", toolName)
|
||||||
|
}
|
||||||
return handler(runCtx, args)
|
return handler(runCtx, args)
|
||||||
},
|
},
|
||||||
OnDone: func(exec *ToolExecution) {
|
OnDone: func(exec *ToolExecution) {
|
||||||
|
|||||||
@@ -23,9 +23,20 @@ func TestToolAuthorizerIsUniversalAndExecutionKeepsOwner(t *testing.T) {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if _, _, err := server.CallTool(context.Background(), "echo", nil); err == nil {
|
_, deniedExecutionID, err := server.CallTool(context.Background(), "echo", nil)
|
||||||
|
if err == nil {
|
||||||
t.Fatal("tool call without principal was allowed")
|
t.Fatal("tool call without principal was allowed")
|
||||||
}
|
}
|
||||||
|
if deniedExecutionID == "" {
|
||||||
|
t.Fatal("denied tool call should still return an execution id")
|
||||||
|
}
|
||||||
|
deniedExecution, ok := server.GetExecution(deniedExecutionID)
|
||||||
|
if !ok || deniedExecution == nil {
|
||||||
|
t.Fatalf("missing denied execution %q", deniedExecutionID)
|
||||||
|
}
|
||||||
|
if deniedExecution.Status != ToolExecutionStatusFailed || !strings.Contains(deniedExecution.Error, "principal required") {
|
||||||
|
t.Fatalf("denied execution = %#v, want failed with authorization error", deniedExecution)
|
||||||
|
}
|
||||||
ctx := authctx.WithPrincipal(context.Background(), authctx.NewPrincipal("u1", "user", "assigned", map[string]bool{"mcp:execute": true}))
|
ctx := authctx.WithPrincipal(context.Background(), authctx.NewPrincipal("u1", "user", "assigned", map[string]bool{"mcp:execute": true}))
|
||||||
_, executionID, err := server.CallTool(ctx, "echo", nil)
|
_, executionID, err := server.CallTool(ctx, "echo", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ func isEinoTransientRunError(err error) bool {
|
|||||||
"bad gateway",
|
"bad gateway",
|
||||||
"gateway timeout",
|
"gateway timeout",
|
||||||
"internal server error",
|
"internal server error",
|
||||||
|
"unexpected internal error",
|
||||||
"connection reset",
|
"connection reset",
|
||||||
"connection refused",
|
"connection refused",
|
||||||
"connection closed",
|
"connection closed",
|
||||||
@@ -72,6 +73,7 @@ func isEinoTransientRunError(err error) bool {
|
|||||||
"dial tcp",
|
"dial tcp",
|
||||||
"tls handshake timeout",
|
"tls handshake timeout",
|
||||||
"stream error",
|
"stream error",
|
||||||
|
"failed to receive stream chunk",
|
||||||
"goaway", // http2: server sent GOAWAY and closed the connection
|
"goaway", // http2: server sent GOAWAY and closed the connection
|
||||||
"unexpected eof",
|
"unexpected eof",
|
||||||
`": eof`, // net/http: Post "url": EOF (often wraps io.EOF)
|
`": eof`, // net/http: Post "url": EOF (often wraps io.EOF)
|
||||||
@@ -136,7 +138,8 @@ func einoTransientRunErrorUserDetail(err error) (kind, summary string) {
|
|||||||
case strings.Contains(lower, "overloaded") ||
|
case strings.Contains(lower, "overloaded") ||
|
||||||
strings.Contains(lower, "capacity") ||
|
strings.Contains(lower, "capacity") ||
|
||||||
strings.Contains(lower, "temporarily unavailable") ||
|
strings.Contains(lower, "temporarily unavailable") ||
|
||||||
strings.Contains(lower, "service unavailable"):
|
strings.Contains(lower, "service unavailable") ||
|
||||||
|
strings.Contains(lower, "unexpected internal error"):
|
||||||
kind = "upstream_busy"
|
kind = "upstream_busy"
|
||||||
case strings.Contains(lower, "connection reset") ||
|
case strings.Contains(lower, "connection reset") ||
|
||||||
strings.Contains(lower, "connection refused") ||
|
strings.Contains(lower, "connection refused") ||
|
||||||
@@ -153,6 +156,7 @@ func einoTransientRunErrorUserDetail(err error) (kind, summary string) {
|
|||||||
strings.Contains(lower, "unexpected eof"):
|
strings.Contains(lower, "unexpected eof"):
|
||||||
kind = "network"
|
kind = "network"
|
||||||
case strings.Contains(lower, "stream error") ||
|
case strings.Contains(lower, "stream error") ||
|
||||||
|
strings.Contains(lower, "failed to receive stream chunk") ||
|
||||||
strings.Contains(lower, "unexpected end of json"):
|
strings.Contains(lower, "unexpected end of json"):
|
||||||
kind = "stream"
|
kind = "stream"
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ func TestIsEinoTransientRunError(t *testing.T) {
|
|||||||
{"rate limit", errors.New(`{"error":"rate limit exceeded"}`), true},
|
{"rate limit", errors.New(`{"error":"rate limit exceeded"}`), true},
|
||||||
{"connection reset", errors.New("read tcp: connection reset by peer"), true},
|
{"connection reset", errors.New("read tcp: connection reset by peer"), true},
|
||||||
{"http2 goaway", errors.New("failed to receive stream chunk: error, http2: server sent GOAWAY and closed the connection; LastStreamID=791, ErrCode=NO_ERROR"), true},
|
{"http2 goaway", errors.New("failed to receive stream chunk: error, http2: server sent GOAWAY and closed the connection; LastStreamID=791, ErrCode=NO_ERROR"), true},
|
||||||
|
{"unexpected internal stream chunk", errors.New("failed to receive stream chunk: error, The service encountered an unexpected internal error. Request id: 0217851391106464f01ec66621d0980a42fd45436ed75957a6a0a"), true},
|
||||||
{"unexpected eof", errors.New("unexpected EOF"), true},
|
{"unexpected eof", errors.New("unexpected EOF"), true},
|
||||||
{"503", errors.New("upstream returned 503"), true},
|
{"503", errors.New("upstream returned 503"), true},
|
||||||
{"iteration limit", errors.New("max iteration reached"), false},
|
{"iteration limit", errors.New("max iteration reached"), false},
|
||||||
@@ -74,6 +75,7 @@ func TestEinoTransientRunErrorUserDetail(t *testing.T) {
|
|||||||
{"upstream", errors.New("upstream returned 503"), "upstream_server"},
|
{"upstream", errors.New("upstream returned 503"), "upstream_server"},
|
||||||
{"network", errors.New("read tcp: connection reset by peer"), "network"},
|
{"network", errors.New("read tcp: connection reset by peer"), "network"},
|
||||||
{"stream", errors.New("unexpected end of JSON"), "stream"},
|
{"stream", errors.New("unexpected end of JSON"), "stream"},
|
||||||
|
{"stream chunk", errors.New("failed to receive stream chunk: error, The service encountered an unexpected internal error. Request id: abc"), "upstream_busy"},
|
||||||
}
|
}
|
||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
tc := tc
|
tc := tc
|
||||||
|
|||||||
@@ -96,7 +96,17 @@ func (m *modelOutputGuardMiddleware) AfterModelRewriteState(
|
|||||||
badIndex := -1
|
badIndex := -1
|
||||||
argumentBytes := 0
|
argumentBytes := 0
|
||||||
if strings.EqualFold(strings.TrimSpace(finishReason), "length") {
|
if strings.EqualFold(strings.TrimSpace(finishReason), "length") {
|
||||||
reason = "output_limit"
|
if len(last.ToolCalls) == 0 {
|
||||||
|
reason = "output_limit"
|
||||||
|
} else {
|
||||||
|
for i, tc := range last.ToolCalls {
|
||||||
|
r, n := validateGeneratedToolCall(tc, m.cfg)
|
||||||
|
if r != "" {
|
||||||
|
reason, badIndex, argumentBytes = "output_limit", i, n
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
for i, tc := range last.ToolCalls {
|
for i, tc := range last.ToolCalls {
|
||||||
r, n := validateGeneratedToolCall(tc, m.cfg)
|
r, n := validateGeneratedToolCall(tc, m.cfg)
|
||||||
|
|||||||
@@ -50,6 +50,18 @@ func TestModelOutputGuardRejectsTruncatedToolCallBeforeExecution(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestModelOutputGuardAllowsValidToolCallDespiteLengthFinish(t *testing.T) {
|
||||||
|
original := `{"command":"echo ok"}`
|
||||||
|
state, err := runModelOutputGuard(t, []adk.Message{schema.UserMessage("run"), guardedAssistant(original, "length")}, config.MultiAgentEinoMiddlewareConfig{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got := state.Messages[len(state.Messages)-1].ToolCalls[0].Function.Arguments
|
||||||
|
if got != original {
|
||||||
|
t.Fatalf("valid arguments should pass unchanged: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestModelOutputGuardRejectsInvalidJSONShapes(t *testing.T) {
|
func TestModelOutputGuardRejectsInvalidJSONShapes(t *testing.T) {
|
||||||
for _, arguments := range []string{"", `[]`, `{"command":`} {
|
for _, arguments := range []string{"", `[]`, `{"command":`} {
|
||||||
t.Run(arguments, func(t *testing.T) {
|
t.Run(arguments, func(t *testing.T) {
|
||||||
|
|||||||
@@ -893,7 +893,7 @@ func NewEinoHTTPClient(cfg *config.OpenAIConfig, base *http.Client) *http.Client
|
|||||||
if transport == nil {
|
if transport == nil {
|
||||||
transport = http.DefaultTransport
|
transport = http.DefaultTransport
|
||||||
}
|
}
|
||||||
transport = &reasoningToolChoiceCompatRoundTripper{base: transport}
|
transport = &reasoningToolChoiceCompatRoundTripper{base: transport, cfg: cfg}
|
||||||
if isClaudeProvider(cfg) {
|
if isClaudeProvider(cfg) {
|
||||||
transport = &claudeRoundTripper{
|
transport = &claudeRoundTripper{
|
||||||
base: transport,
|
base: transport,
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package openai
|
package openai
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/bytedance/sonic"
|
"github.com/bytedance/sonic"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -52,6 +54,28 @@ func StripReasoningIfForcedToolChoice(rawBody []byte) ([]byte, error) {
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// StripToolChoiceForThinkingMode removes tool_choice while preserving tools and
|
||||||
|
// thinking fields. DeepSeek thinking mode can use tools, but rejects the
|
||||||
|
// tool_choice parameter itself on some agent requests.
|
||||||
|
func StripToolChoiceForThinkingMode(rawBody []byte) ([]byte, error) {
|
||||||
|
var payload map[string]any
|
||||||
|
if err := sonic.Unmarshal(rawBody, &payload); err != nil {
|
||||||
|
return rawBody, nil
|
||||||
|
}
|
||||||
|
if !thinkingModeEnabledByPayload(payload) {
|
||||||
|
return rawBody, nil
|
||||||
|
}
|
||||||
|
if _, ok := payload["tool_choice"]; !ok {
|
||||||
|
return rawBody, nil
|
||||||
|
}
|
||||||
|
delete(payload, "tool_choice")
|
||||||
|
out, err := sonic.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return rawBody, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
func stripReasoningFields(payload map[string]any) bool {
|
func stripReasoningFields(payload map[string]any) bool {
|
||||||
changed := false
|
changed := false
|
||||||
for _, key := range reasoningPayloadKeys {
|
for _, key := range reasoningPayloadKeys {
|
||||||
@@ -77,3 +101,17 @@ func forcedToolChoiceIncompatibleWithThinking(payload map[string]any) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func thinkingModeEnabledByPayload(payload map[string]any) bool {
|
||||||
|
thinking, ok := payload["thinking"]
|
||||||
|
if !ok || thinking == nil {
|
||||||
|
// DeepSeek enables thinking by default unless explicitly disabled.
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if m, ok := thinking.(map[string]any); ok {
|
||||||
|
if typ, ok := m["type"].(string); ok && strings.EqualFold(strings.TrimSpace(typ), "disabled") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestStripReasoningFromChatCompletionBody(t *testing.T) {
|
func TestStripReasoningFromChatCompletionBody(t *testing.T) {
|
||||||
@@ -82,6 +84,58 @@ func TestStripReasoningIfForcedToolChoice(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestStripToolChoiceForThinkingMode(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
in string
|
||||||
|
wantToolChoice bool
|
||||||
|
wantThinking bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "enabled thinking removes tool_choice",
|
||||||
|
in: `{"model":"deepseek-v4","messages":[],"thinking":{"type":"enabled"},"tool_choice":"required","tools":[{"type":"function","function":{"name":"scan"}}]}`,
|
||||||
|
wantToolChoice: false,
|
||||||
|
wantThinking: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "default thinking removes tool_choice",
|
||||||
|
in: `{"model":"deepseek-v4","messages":[],"tool_choice":"auto","tools":[]}`,
|
||||||
|
wantToolChoice: false,
|
||||||
|
wantThinking: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "disabled thinking keeps tool_choice",
|
||||||
|
in: `{"model":"deepseek-v4","messages":[],"thinking":{"type":"disabled"},"tool_choice":"required","tools":[]}`,
|
||||||
|
wantToolChoice: true,
|
||||||
|
wantThinking: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "no tool_choice unchanged",
|
||||||
|
in: `{"model":"deepseek-v4","messages":[],"thinking":{"type":"enabled"},"tools":[]}`,
|
||||||
|
wantToolChoice: false,
|
||||||
|
wantThinking: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
out, err := StripToolChoiceForThinkingMode([]byte(tc.in))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
s := string(out)
|
||||||
|
if strings.Contains(s, "tool_choice") != tc.wantToolChoice {
|
||||||
|
t.Fatalf("tool_choice presence mismatch, got %s", s)
|
||||||
|
}
|
||||||
|
if strings.Contains(s, "thinking") != tc.wantThinking {
|
||||||
|
t.Fatalf("thinking presence mismatch, got %s", s)
|
||||||
|
}
|
||||||
|
if !strings.Contains(s, "tools") {
|
||||||
|
t.Fatalf("expected tools preserved, got %s", s)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestReasoningToolChoiceCompatRoundTripper(t *testing.T) {
|
func TestReasoningToolChoiceCompatRoundTripper(t *testing.T) {
|
||||||
var gotBody string
|
var gotBody string
|
||||||
rt := &reasoningToolChoiceCompatRoundTripper{
|
rt := &reasoningToolChoiceCompatRoundTripper{
|
||||||
@@ -113,6 +167,44 @@ func TestReasoningToolChoiceCompatRoundTripper(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReasoningToolChoiceCompatRoundTripperDeepSeek(t *testing.T) {
|
||||||
|
var gotBody string
|
||||||
|
rt := &reasoningToolChoiceCompatRoundTripper{
|
||||||
|
cfg: &config.OpenAIConfig{
|
||||||
|
BaseURL: "https://api.deepseek.com/v1",
|
||||||
|
Model: "deepseek-v4",
|
||||||
|
},
|
||||||
|
base: roundTripperFunc(func(req *http.Request) (*http.Response, error) {
|
||||||
|
b, _ := io.ReadAll(req.Body)
|
||||||
|
gotBody = string(b)
|
||||||
|
return &http.Response{
|
||||||
|
StatusCode: 200,
|
||||||
|
Body: io.NopCloser(strings.NewReader(`{"choices":[{"message":{"content":"ok"}}]}`)),
|
||||||
|
Header: http.Header{"Content-Type": []string{"application/json"}},
|
||||||
|
}, nil
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
req, err := http.NewRequest(http.MethodPost, "https://api.deepseek.com/v1/chat/completions", strings.NewReader(
|
||||||
|
`{"model":"deepseek-v4","thinking":{"type":"enabled"},"tool_choice":"required","tools":[],"messages":[]}`,
|
||||||
|
))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
_, err = rt.RoundTrip(req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if strings.Contains(gotBody, "tool_choice") {
|
||||||
|
t.Fatalf("expected DeepSeek tool_choice stripped in transit, got %s", gotBody)
|
||||||
|
}
|
||||||
|
if !strings.Contains(gotBody, "thinking") {
|
||||||
|
t.Fatalf("expected thinking preserved for DeepSeek, got %s", gotBody)
|
||||||
|
}
|
||||||
|
if !strings.Contains(gotBody, "tools") {
|
||||||
|
t.Fatalf("expected tools preserved for DeepSeek, got %s", gotBody)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type roundTripperFunc func(*http.Request) (*http.Response, error)
|
type roundTripperFunc func(*http.Request) (*http.Response, error)
|
||||||
|
|
||||||
func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"cyberstrike-ai/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// reasoningToolChoiceCompatRoundTripper strips thinking/reasoning fields from
|
// reasoningToolChoiceCompatRoundTripper strips thinking/reasoning fields from
|
||||||
@@ -13,6 +15,7 @@ import (
|
|||||||
// when thinking mode is enabled on the same request.
|
// when thinking mode is enabled on the same request.
|
||||||
type reasoningToolChoiceCompatRoundTripper struct {
|
type reasoningToolChoiceCompatRoundTripper struct {
|
||||||
base http.RoundTripper
|
base http.RoundTripper
|
||||||
|
cfg *config.OpenAIConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rt *reasoningToolChoiceCompatRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
func (rt *reasoningToolChoiceCompatRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
@@ -32,7 +35,13 @@ func (rt *reasoningToolChoiceCompatRoundTripper) RoundTrip(req *http.Request) (*
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
patched, perr := StripReasoningIfForcedToolChoice(body)
|
patched := body
|
||||||
|
var perr error
|
||||||
|
if isDeepSeekToolChoiceCompatProfile(rt.cfg) {
|
||||||
|
patched, perr = StripToolChoiceForThinkingMode(body)
|
||||||
|
} else {
|
||||||
|
patched, perr = StripReasoningIfForcedToolChoice(body)
|
||||||
|
}
|
||||||
if perr != nil {
|
if perr != nil {
|
||||||
patched = body
|
patched = body
|
||||||
}
|
}
|
||||||
@@ -41,3 +50,19 @@ func (rt *reasoningToolChoiceCompatRoundTripper) RoundTrip(req *http.Request) (*
|
|||||||
req.Header.Set("Content-Length", strconv.Itoa(len(patched)))
|
req.Header.Set("Content-Length", strconv.Itoa(len(patched)))
|
||||||
return rt.base.RoundTrip(req)
|
return rt.base.RoundTrip(req)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isDeepSeekToolChoiceCompatProfile(cfg *config.OpenAIConfig) bool {
|
||||||
|
if cfg == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
profile := strings.ToLower(strings.TrimSpace(cfg.Reasoning.ProfileEffective()))
|
||||||
|
if profile == "deepseek" || profile == "deepseek_compat" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if profile != "" && profile != "auto" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
baseURL := strings.ToLower(cfg.BaseURL)
|
||||||
|
model := strings.ToLower(cfg.Model)
|
||||||
|
return strings.Contains(baseURL, "deepseek") || strings.Contains(model, "deepseek")
|
||||||
|
}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
bodyDepFactLine = regexp.MustCompile(`(?im)^[\s\-*]*依赖事实\s*[::]\s*([a-z0-9][a-z0-9._/-]*)`)
|
bodyDepFactLine = regexp.MustCompile(`(?im)^[\s\-*]*依赖事实\s*[::]\s*([a-zA-Z0-9][a-zA-Z0-9._/-]*)`)
|
||||||
bodyRelFactLine = regexp.MustCompile(`(?im)^[\s\-*]*相关\s*fact_key\s*[::]\s*([a-z0-9][a-z0-9._/-]*)`)
|
bodyRelFactLine = regexp.MustCompile(`(?im)^[\s\-*]*相关\s*fact_key\s*[::]\s*([a-zA-Z0-9][a-zA-Z0-9._/-]*)`)
|
||||||
bodyAssocSection = regexp.MustCompile(`(?im)^##\s*关联\s*$`)
|
bodyAssocSection = regexp.MustCompile(`(?im)^##\s*关联\s*$`)
|
||||||
bodySyncLinksHead = "结构化关系边(自动同步)"
|
bodySyncLinksHead = "结构化关系边(自动同步)"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -61,25 +61,30 @@ show_progress() {
|
|||||||
printf "\r"
|
printf "\r"
|
||||||
}
|
}
|
||||||
|
|
||||||
echo ""
|
print_banner() {
|
||||||
echo "=========================================="
|
local show_mirrors="${1:-1}"
|
||||||
echo " CyberStrikeAI Deploy & Start Script"
|
echo ""
|
||||||
echo " (HTTPS with self-signed cert by default; plain HTTP: $0 --http)"
|
echo "=========================================="
|
||||||
echo "=========================================="
|
echo " CyberStrikeAI Deploy & Start Script"
|
||||||
echo ""
|
echo " (HTTPS with self-signed cert by default; plain HTTP: $0 --http)"
|
||||||
|
echo "=========================================="
|
||||||
|
echo ""
|
||||||
|
|
||||||
# Show temporary mirror/proxy info
|
if [ "$show_mirrors" -eq 1 ]; then
|
||||||
echo ""
|
# Show temporary mirror/proxy info
|
||||||
warning "Note: this script uses temporary mirrors to speed up downloads"
|
echo ""
|
||||||
echo ""
|
warning "Note: this script uses temporary mirrors to speed up downloads"
|
||||||
info "Python pip temporary mirror:"
|
echo ""
|
||||||
echo " ${PIP_INDEX_URL}"
|
info "Python pip temporary mirror:"
|
||||||
info "Go temporary proxy:"
|
echo " ${PIP_INDEX_URL}"
|
||||||
echo " ${GOPROXY}"
|
info "Go temporary proxy:"
|
||||||
echo ""
|
echo " ${GOPROXY}"
|
||||||
note "These settings apply only while this script runs and do not change system config"
|
echo ""
|
||||||
echo ""
|
note "These settings apply only while this script runs and do not change system config"
|
||||||
sleep 1
|
echo ""
|
||||||
|
sleep 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
CONFIG_FILE="$ROOT_DIR/config.yaml"
|
CONFIG_FILE="$ROOT_DIR/config.yaml"
|
||||||
EXAMPLE_CONFIG_FILE="$ROOT_DIR/config.example.yaml"
|
EXAMPLE_CONFIG_FILE="$ROOT_DIR/config.example.yaml"
|
||||||
@@ -136,6 +141,28 @@ check_go() {
|
|||||||
success "Go check passed: $(go version)"
|
success "Go check passed: $(go version)"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_go_quiet() {
|
||||||
|
if ! command -v go >/dev/null 2>&1; then
|
||||||
|
error "Go not found"
|
||||||
|
echo ""
|
||||||
|
info "Install Go 1.21 or later first:"
|
||||||
|
echo " macOS: brew install go"
|
||||||
|
echo " Ubuntu: sudo apt-get install golang-go"
|
||||||
|
echo " CentOS: sudo yum install golang"
|
||||||
|
echo " Or visit: https://go.dev/dl/"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
GO_VERSION=$(go version | awk '{print $3}' | sed 's/go//')
|
||||||
|
GO_MAJOR=$(echo "$GO_VERSION" | cut -d. -f1)
|
||||||
|
GO_MINOR=$(echo "$GO_VERSION" | cut -d. -f2)
|
||||||
|
|
||||||
|
if [ "$GO_MAJOR" -lt 1 ] || ([ "$GO_MAJOR" -eq 1 ] && [ "$GO_MINOR" -lt 21 ]); then
|
||||||
|
error "Go version too old: $GO_VERSION (requires 1.21+)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Set up Python virtual environment
|
# Set up Python virtual environment
|
||||||
setup_python_env() {
|
setup_python_env() {
|
||||||
if [ ! -d "$VENV_DIR" ]; then
|
if [ ! -d "$VENV_DIR" ]; then
|
||||||
@@ -331,6 +358,34 @@ build_go_project() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
build_go_project_quiet() {
|
||||||
|
info "Building $BINARY_NAME..."
|
||||||
|
|
||||||
|
GO_DOWNLOAD_LOG=$(mktemp)
|
||||||
|
if ! GOPROXY="$GOPROXY" go mod download >"$GO_DOWNLOAD_LOG" 2>&1; then
|
||||||
|
error "Go dependency download failed"
|
||||||
|
echo ""
|
||||||
|
info "Download error details:"
|
||||||
|
cat "$GO_DOWNLOAD_LOG" | sed 's/^/ /'
|
||||||
|
echo ""
|
||||||
|
rm -f "$GO_DOWNLOAD_LOG"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f "$GO_DOWNLOAD_LOG"
|
||||||
|
|
||||||
|
GO_BUILD_LOG=$(mktemp)
|
||||||
|
if ! GOPROXY="$GOPROXY" go build -o "$BINARY_NAME" cmd/server/main.go >"$GO_BUILD_LOG" 2>&1; then
|
||||||
|
error "Build failed"
|
||||||
|
echo ""
|
||||||
|
info "Build error details:"
|
||||||
|
cat "$GO_BUILD_LOG" | sed 's/^/ /'
|
||||||
|
echo ""
|
||||||
|
rm -f "$GO_BUILD_LOG"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f "$GO_BUILD_LOG"
|
||||||
|
}
|
||||||
|
|
||||||
# Check whether a rebuild is needed
|
# Check whether a rebuild is needed
|
||||||
need_rebuild() {
|
need_rebuild() {
|
||||||
if [ ! -f "$BINARY_NAME" ]; then
|
if [ ! -f "$BINARY_NAME" ]; then
|
||||||
@@ -351,6 +406,7 @@ need_rebuild() {
|
|||||||
# Default: HTTPS (--https passed to binary); --http forces plain HTTP even if config.yaml enables TLS.
|
# Default: HTTPS (--https passed to binary); --http forces plain HTTP even if config.yaml enables TLS.
|
||||||
main() {
|
main() {
|
||||||
USE_HTTPS=1
|
USE_HTTPS=1
|
||||||
|
RESET_ADMIN_PASSWORD=0
|
||||||
FORWARD_ARGS=()
|
FORWARD_ARGS=()
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
if [ "$arg" = "--http" ]; then
|
if [ "$arg" = "--http" ]; then
|
||||||
@@ -361,9 +417,33 @@ main() {
|
|||||||
USE_HTTPS=1
|
USE_HTTPS=1
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
if [ "$arg" = "--reset-admin-password" ]; then
|
||||||
|
RESET_ADMIN_PASSWORD=1
|
||||||
|
continue
|
||||||
|
fi
|
||||||
FORWARD_ARGS+=("$arg")
|
FORWARD_ARGS+=("$arg")
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ "$RESET_ADMIN_PASSWORD" -eq 1 ]; then
|
||||||
|
if [ ! -f "$CONFIG_FILE" ] && [ ! -f "$EXAMPLE_CONFIG_FILE" ]; then
|
||||||
|
error "config.yaml not found, and config.example.yaml is missing"
|
||||||
|
info "The server binary creates config.yaml from config.example.yaml on first start"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
check_go_quiet
|
||||||
|
if need_rebuild; then
|
||||||
|
build_go_project_quiet
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
if [ "${#FORWARD_ARGS[@]}" -gt 0 ]; then
|
||||||
|
exec "./$BINARY_NAME" -config "$CONFIG_FILE" --reset-admin-password "${FORWARD_ARGS[@]}"
|
||||||
|
else
|
||||||
|
exec "./$BINARY_NAME" -config "$CONFIG_FILE" --reset-admin-password
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_banner 1
|
||||||
|
|
||||||
# Environment checks
|
# Environment checks
|
||||||
info "Checking runtime environment..."
|
info "Checking runtime environment..."
|
||||||
check_python
|
check_python
|
||||||
@@ -417,5 +497,5 @@ main() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Run main (supports args, e.g. ./run.sh --http)
|
# Run main (supports args, e.g. ./run.sh --http, ./run.sh --reset-admin-password)
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
+478
-88
@@ -4430,7 +4430,7 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
|
|
||||||
.ai-channel-manager {
|
.ai-channel-manager {
|
||||||
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 88%, transparent);
|
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 88%, transparent);
|
||||||
border-radius: 10px;
|
border-radius: 8px;
|
||||||
background: var(--card-bg, #fff);
|
background: var(--card-bg, #fff);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
@@ -4446,8 +4446,8 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-manager-header h4 {
|
.ai-channel-manager-header h4 {
|
||||||
margin: 0 0 8px;
|
margin: 0 0 6px;
|
||||||
font-size: 16px;
|
font-size: 17px;
|
||||||
line-height: 1.25;
|
line-height: 1.25;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4467,55 +4467,75 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
color: var(--error-color, #e53e3e);
|
color: var(--error-color, #e53e3e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ai-channel-header-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 10px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.ai-channel-save-btn {
|
.ai-channel-save-btn {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
min-width: 92px;
|
min-width: 92px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-manager-body {
|
.ai-channel-manager-body {
|
||||||
display: grid;
|
display: block;
|
||||||
grid-template-columns: minmax(280px, 360px) minmax(0, 1fr);
|
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
align-items: stretch;
|
|
||||||
background: var(--card-bg, #fff);
|
background: var(--card-bg, #fff);
|
||||||
overflow: visible;
|
overflow: visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-sidebar {
|
.ai-channel-switcher {
|
||||||
position: relative;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 10px;
|
|
||||||
min-height: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
border-right: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 76%, transparent);
|
|
||||||
background: color-mix(in srgb, var(--bg-secondary, #f8fafc) 86%, var(--card-bg, #fff));
|
|
||||||
padding: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ai-channel-sidebar-head {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 10px;
|
gap: 16px;
|
||||||
margin-bottom: 0;
|
padding: 16px 22px;
|
||||||
color: var(--text-secondary, #4a5568);
|
border-bottom: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 72%, transparent);
|
||||||
font-size: 12px;
|
background: color-mix(in srgb, var(--bg-secondary, #f8fafc) 70%, var(--card-bg, #fff));
|
||||||
font-weight: 700;
|
|
||||||
letter-spacing: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-bulk-actions {
|
.ai-channel-switcher-field {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto minmax(260px, 420px);
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-switcher-field label {
|
||||||
|
color: var(--text-secondary, #4a5568);
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 700;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-switch-select {
|
||||||
|
width: 100%;
|
||||||
|
min-height: 38px;
|
||||||
|
padding: 0.45rem 2rem 0.45rem 0.7rem;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 88%, transparent);
|
||||||
|
border-radius: 7px;
|
||||||
|
background: color-mix(in srgb, var(--input-bg, var(--card-bg, #fff)) 92%, transparent);
|
||||||
|
color: var(--text-primary, #2d3748);
|
||||||
|
font-size: 0.875rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-switch-select:focus {
|
||||||
|
border-color: color-mix(in srgb, var(--accent-color, #3182ce) 70%, transparent);
|
||||||
|
box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent-color, #3182ce) 12%, transparent);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-switcher-actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 5px;
|
gap: 8px;
|
||||||
margin: 0;
|
|
||||||
min-width: 0;
|
|
||||||
padding: 0;
|
|
||||||
border: 0;
|
|
||||||
background: transparent;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-bulk-btn {
|
.ai-channel-bulk-btn {
|
||||||
@@ -4523,8 +4543,8 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
min-height: 26px;
|
min-height: 28px;
|
||||||
padding: 4px 8px;
|
padding: 5px 9px;
|
||||||
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 68%, transparent);
|
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 68%, transparent);
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
background: color-mix(in srgb, var(--card-bg, #fff) 38%, transparent);
|
background: color-mix(in srgb, var(--card-bg, #fff) 38%, transparent);
|
||||||
@@ -4555,8 +4575,8 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-icon-btn {
|
.ai-channel-icon-btn {
|
||||||
width: 30px;
|
width: 32px;
|
||||||
height: 30px;
|
height: 32px;
|
||||||
border: 1px solid var(--border-color, #e2e8f0);
|
border: 1px solid var(--border-color, #e2e8f0);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
background: var(--card-bg, #fff);
|
background: var(--card-bg, #fff);
|
||||||
@@ -4577,19 +4597,7 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-list {
|
.ai-channel-list {
|
||||||
position: absolute;
|
display: none;
|
||||||
top: 64px;
|
|
||||||
right: 13px;
|
|
||||||
bottom: 18px;
|
|
||||||
left: 18px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 10px;
|
|
||||||
min-height: 0;
|
|
||||||
overflow-y: auto;
|
|
||||||
overflow-x: hidden;
|
|
||||||
padding: 2px 5px 2px 1px;
|
|
||||||
scrollbar-gutter: stable;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-list::-webkit-scrollbar {
|
.ai-channel-list::-webkit-scrollbar {
|
||||||
@@ -4616,10 +4624,10 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
align-items: start;
|
align-items: start;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 92px;
|
min-height: 86px;
|
||||||
padding: 12px;
|
padding: 11px;
|
||||||
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 64%, transparent);
|
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 64%, transparent);
|
||||||
border-radius: 8px;
|
border-radius: 7px;
|
||||||
background: color-mix(in srgb, var(--card-bg, #fff) 70%, transparent);
|
background: color-mix(in srgb, var(--card-bg, #fff) 70%, transparent);
|
||||||
color: var(--text-color, #2d3748);
|
color: var(--text-color, #2d3748);
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@@ -4640,7 +4648,7 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
height: 16px;
|
height: 16px;
|
||||||
margin: 3px 0 0;
|
margin: 3px 0 0;
|
||||||
border: 1px solid color-mix(in srgb, var(--text-muted, #718096) 52%, transparent);
|
border: 1px solid color-mix(in srgb, var(--text-muted, #718096) 52%, transparent);
|
||||||
border-radius: 5px;
|
border-radius: 4px;
|
||||||
appearance: none;
|
appearance: none;
|
||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
background-color: color-mix(in srgb, var(--card-bg, #fff) 84%, transparent);
|
background-color: color-mix(in srgb, var(--card-bg, #fff) 84%, transparent);
|
||||||
@@ -4671,7 +4679,6 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
.ai-channel-list-item:hover {
|
.ai-channel-list-item:hover {
|
||||||
background: var(--card-bg, #fff);
|
background: var(--card-bg, #fff);
|
||||||
border-color: color-mix(in srgb, var(--accent-color, #3182ce) 24%, transparent);
|
border-color: color-mix(in srgb, var(--accent-color, #3182ce) 24%, transparent);
|
||||||
transform: translateY(-1px);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-list-item.active {
|
.ai-channel-list-item.active {
|
||||||
@@ -4732,6 +4739,10 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
color: #10b981;
|
color: #10b981;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ai-channel-status-label.complete {
|
||||||
|
color: #3b82f6;
|
||||||
|
}
|
||||||
|
|
||||||
.ai-channel-status-label.testing {
|
.ai-channel-status-label.testing {
|
||||||
color: #3b82f6;
|
color: #3b82f6;
|
||||||
}
|
}
|
||||||
@@ -4753,6 +4764,10 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
background: #10b981;
|
background: #10b981;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ai-channel-status-dot.complete {
|
||||||
|
background: #3b82f6;
|
||||||
|
}
|
||||||
|
|
||||||
.ai-channel-status-dot.draft {
|
.ai-channel-status-dot.draft {
|
||||||
background: #f59e0b;
|
background: #f59e0b;
|
||||||
}
|
}
|
||||||
@@ -4779,17 +4794,17 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
min-width: 0;
|
min-width: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
overflow-y: visible;
|
overflow-y: visible;
|
||||||
padding: 22px 28px 28px;
|
padding: 20px 28px 28px;
|
||||||
background: var(--card-bg, #fff);
|
background: var(--card-bg, #fff);
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-head {
|
.ai-channel-editor-head {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-start;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 18px;
|
gap: 18px;
|
||||||
margin-bottom: 18px;
|
margin-bottom: 6px;
|
||||||
padding-bottom: 18px;
|
padding-bottom: 16px;
|
||||||
border-bottom: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 72%, transparent);
|
border-bottom: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 72%, transparent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4801,18 +4816,60 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-head h5 {
|
.ai-channel-editor-title {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
color: var(--text-color, #2d3748);
|
|
||||||
font-size: 22px;
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1.2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ai-channel-editor-head p {
|
|
||||||
margin: 4px 0 0;
|
|
||||||
color: var(--text-muted, #718096);
|
color: var(--text-muted, #718096);
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-meta {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: 8px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-chip {
|
||||||
|
max-width: 220px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
border: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 70%, transparent);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: color-mix(in srgb, var(--card-bg, #fff) 92%, var(--primary-color, #3182ce));
|
||||||
|
color: var(--text-muted, #718096);
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1;
|
||||||
|
padding: 7px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-chip.default,
|
||||||
|
.ai-channel-editor-chip.complete {
|
||||||
|
border-color: rgba(49, 130, 206, 0.22);
|
||||||
|
background: rgba(49, 130, 206, 0.1);
|
||||||
|
color: var(--primary-color, #3182ce);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-chip.ready {
|
||||||
|
border-color: rgba(16, 185, 129, 0.22);
|
||||||
|
background: rgba(16, 185, 129, 0.1);
|
||||||
|
color: #059669;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-chip.testing {
|
||||||
|
border-color: rgba(214, 158, 46, 0.24);
|
||||||
|
background: rgba(214, 158, 46, 0.1);
|
||||||
|
color: #b7791f;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-chip.failed,
|
||||||
|
.ai-channel-editor-chip.draft {
|
||||||
|
border-color: rgba(229, 62, 62, 0.2);
|
||||||
|
background: rgba(229, 62, 62, 0.08);
|
||||||
|
color: var(--error-color, #e53e3e);
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-actions {
|
.ai-channel-editor-actions {
|
||||||
@@ -4827,8 +4884,9 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
color: var(--error-color, #e53e3e);
|
color: var(--error-color, #e53e3e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.ai-channel-editor-form {
|
.ai-channel-editor-form {
|
||||||
max-width: 980px;
|
max-width: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-form .form-group {
|
.ai-channel-editor-form .form-group {
|
||||||
@@ -4837,7 +4895,7 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
|
|
||||||
.ai-channel-editor-form .form-group label {
|
.ai-channel-editor-form .form-group label {
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 0;
|
margin-bottom: 6px;
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
@@ -4848,10 +4906,14 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
.ai-channel-editor-form input[type="password"],
|
.ai-channel-editor-form input[type="password"],
|
||||||
.ai-channel-editor-form input[type="number"],
|
.ai-channel-editor-form input[type="number"],
|
||||||
.ai-channel-editor-form select {
|
.ai-channel-editor-form select {
|
||||||
|
width: 100%;
|
||||||
min-height: 42px;
|
min-height: 42px;
|
||||||
border-radius: 8px;
|
padding: 0.5rem 0.75rem;
|
||||||
|
border-radius: 7px;
|
||||||
border-color: color-mix(in srgb, var(--border-color, #e2e8f0) 88%, transparent);
|
border-color: color-mix(in srgb, var(--border-color, #e2e8f0) 88%, transparent);
|
||||||
background: color-mix(in srgb, var(--input-bg, var(--card-bg, #fff)) 92%, transparent);
|
background: color-mix(in srgb, var(--input-bg, var(--card-bg, #fff)) 92%, transparent);
|
||||||
|
color: var(--text-color, #2d3748);
|
||||||
|
font-size: 0.875rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-form input:focus,
|
.ai-channel-editor-form input:focus,
|
||||||
@@ -4863,9 +4925,175 @@ html[data-theme="dark"] .new-chat-btn:focus-visible {
|
|||||||
|
|
||||||
.ai-channel-editor-form .form-hint,
|
.ai-channel-editor-form .form-hint,
|
||||||
.ai-channel-editor-form small {
|
.ai-channel-editor-form small {
|
||||||
|
display: block;
|
||||||
|
margin-top: 5px;
|
||||||
|
color: var(--text-muted, #718096);
|
||||||
|
font-size: 0.75rem;
|
||||||
line-height: 1.45;
|
line-height: 1.45;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section {
|
||||||
|
padding: 18px 0;
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--border-color, #e2e8f0) 64%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section:last-of-type {
|
||||||
|
border-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 24px;
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head > div:first-child {
|
||||||
|
max-width: 620px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head h6 {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--text-primary, #1f2937);
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head p {
|
||||||
|
margin: 4px 0 0;
|
||||||
|
color: var(--text-muted, #718096);
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.45;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 8px;
|
||||||
|
min-width: 210px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions .form-inline-result {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions .connection-test-result {
|
||||||
|
display: none;
|
||||||
|
max-width: min(760px, 54vw);
|
||||||
|
padding: 8px 10px;
|
||||||
|
border: 1px solid var(--border-color, #e2e8f0);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: color-mix(in srgb, var(--surface-color, #ffffff) 86%, var(--bg-secondary, #f7fafc));
|
||||||
|
color: var(--text-muted, #718096);
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.45;
|
||||||
|
text-align: left;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
word-break: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions .connection-test-result.is-visible {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions .connection-test-result.is-error {
|
||||||
|
border-color: color-mix(in srgb, var(--danger-color, #e53e3e) 42%, var(--border-color, #e2e8f0));
|
||||||
|
background: color-mix(in srgb, var(--danger-color, #e53e3e) 8%, var(--surface-color, #ffffff));
|
||||||
|
color: var(--danger-color, #e53e3e);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions .connection-test-result.is-success {
|
||||||
|
border-color: color-mix(in srgb, var(--success-color, #38a169) 38%, var(--border-color, #e2e8f0));
|
||||||
|
background: color-mix(in srgb, var(--success-color, #38a169) 9%, var(--surface-color, #ffffff));
|
||||||
|
color: var(--success-color, #38a169);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-grid,
|
||||||
|
.ai-channel-reasoning-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(340px, 1fr));
|
||||||
|
column-gap: 16px;
|
||||||
|
row-gap: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-reasoning-grid {
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-editor-form .span-2 {
|
||||||
|
grid-column: 1 / -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.required-mark {
|
||||||
|
color: var(--error-color, #e53e3e);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-inline-result {
|
||||||
|
display: block;
|
||||||
|
margin-top: 6px;
|
||||||
|
color: var(--text-muted, #718096);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
line-height: 1.45;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-reasoning-toggle {
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section {
|
||||||
|
padding: 10px 0 0;
|
||||||
|
border-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section summary {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
min-height: 38px;
|
||||||
|
padding: 0;
|
||||||
|
color: var(--text-primary, #1f2937);
|
||||||
|
cursor: pointer;
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section summary::-webkit-details-marker {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section summary::before {
|
||||||
|
content: "";
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
border-right: 2px solid var(--text-muted, #718096);
|
||||||
|
border-bottom: 2px solid var(--text-muted, #718096);
|
||||||
|
transform: rotate(-45deg);
|
||||||
|
transition: transform 0.16s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section[open] summary::before {
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section summary strong {
|
||||||
|
display: block;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.35;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section summary small {
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-advanced-section[open] .ai-channel-reasoning-grid {
|
||||||
|
margin-top: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
html[data-theme="dark"] .ai-channel-manager {
|
html[data-theme="dark"] .ai-channel-manager {
|
||||||
background: #111827;
|
background: #111827;
|
||||||
border-color: rgba(71, 85, 105, 0.42);
|
border-color: rgba(71, 85, 105, 0.42);
|
||||||
@@ -4876,6 +5104,21 @@ html[data-theme="dark"] .ai-channel-manager-header {
|
|||||||
border-bottom-color: rgba(71, 85, 105, 0.34);
|
border-bottom-color: rgba(71, 85, 105, 0.34);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-switcher {
|
||||||
|
background: #101827;
|
||||||
|
border-bottom-color: rgba(71, 85, 105, 0.34);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-switcher-field label {
|
||||||
|
color: #cbd5e1;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-switch-select {
|
||||||
|
background: rgba(15, 23, 42, 0.72);
|
||||||
|
border-color: rgba(71, 85, 105, 0.44);
|
||||||
|
color: #e5e7eb;
|
||||||
|
}
|
||||||
|
|
||||||
html[data-theme="dark"] .ai-channel-sidebar {
|
html[data-theme="dark"] .ai-channel-sidebar {
|
||||||
background: #101827;
|
background: #101827;
|
||||||
border-right-color: rgba(71, 85, 105, 0.34);
|
border-right-color: rgba(71, 85, 105, 0.34);
|
||||||
@@ -4928,6 +5171,74 @@ html[data-theme="dark"] .ai-channel-editor-head {
|
|||||||
border-bottom-color: rgba(71, 85, 105, 0.34);
|
border-bottom-color: rgba(71, 85, 105, 0.34);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip {
|
||||||
|
border-color: rgba(71, 85, 105, 0.46);
|
||||||
|
background: rgba(15, 23, 42, 0.7);
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.default,
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.complete {
|
||||||
|
border-color: rgba(96, 165, 250, 0.34);
|
||||||
|
background: rgba(96, 165, 250, 0.12);
|
||||||
|
color: #93c5fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.ready {
|
||||||
|
border-color: rgba(52, 211, 153, 0.28);
|
||||||
|
background: rgba(52, 211, 153, 0.1);
|
||||||
|
color: #6ee7b7;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.testing {
|
||||||
|
border-color: rgba(251, 191, 36, 0.28);
|
||||||
|
background: rgba(251, 191, 36, 0.1);
|
||||||
|
color: #fbbf24;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.failed,
|
||||||
|
html[data-theme="dark"] .ai-channel-editor-chip.draft {
|
||||||
|
border-color: rgba(248, 113, 113, 0.28);
|
||||||
|
background: rgba(248, 113, 113, 0.1);
|
||||||
|
color: #fca5a5;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-form-section,
|
||||||
|
html[data-theme="dark"] .ai-channel-advanced-section {
|
||||||
|
border-color: rgba(71, 85, 105, 0.34);
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-form-section-head h6 {
|
||||||
|
color: #e5e7eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-form-section-head p,
|
||||||
|
html[data-theme="dark"] .form-inline-result {
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-section-actions .connection-test-result {
|
||||||
|
border-color: rgba(71, 85, 105, 0.52);
|
||||||
|
background: rgba(15, 23, 42, 0.74);
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-section-actions .connection-test-result.is-error {
|
||||||
|
border-color: rgba(248, 113, 113, 0.42);
|
||||||
|
background: rgba(127, 29, 29, 0.22);
|
||||||
|
color: #f87171;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-section-actions .connection-test-result.is-success {
|
||||||
|
border-color: rgba(52, 211, 153, 0.38);
|
||||||
|
background: rgba(6, 78, 59, 0.22);
|
||||||
|
color: #34d399;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] .ai-channel-advanced-section summary {
|
||||||
|
color: #e5e7eb;
|
||||||
|
}
|
||||||
|
|
||||||
html[data-theme="dark"] .ai-channel-icon-btn {
|
html[data-theme="dark"] .ai-channel-icon-btn {
|
||||||
background: rgba(15, 23, 42, 0.72);
|
background: rgba(15, 23, 42, 0.72);
|
||||||
border-color: rgba(71, 85, 105, 0.44);
|
border-color: rgba(71, 85, 105, 0.44);
|
||||||
@@ -5009,23 +5320,13 @@ html[data-theme="dark"] .ai-channel-editor-form select {
|
|||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-manager-body {
|
.ai-channel-editor-meta {
|
||||||
grid-template-columns: 1fr;
|
justify-content: flex-start;
|
||||||
height: auto;
|
|
||||||
overflow: visible;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-sidebar {
|
.ai-channel-switcher {
|
||||||
border-right: 0;
|
align-items: stretch;
|
||||||
border-bottom: 1px solid var(--border-color, #e2e8f0);
|
flex-direction: column;
|
||||||
max-height: 420px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ai-channel-list {
|
|
||||||
position: static;
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
|
|
||||||
max-height: 360px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor {
|
.ai-channel-editor {
|
||||||
@@ -5035,19 +5336,40 @@ html[data-theme="dark"] .ai-channel-editor-form select {
|
|||||||
|
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
.ai-channel-manager-header,
|
.ai-channel-manager-header,
|
||||||
.ai-channel-sidebar,
|
.ai-channel-switcher,
|
||||||
.ai-channel-editor {
|
.ai-channel-editor {
|
||||||
padding-left: 14px;
|
padding-left: 14px;
|
||||||
padding-right: 14px;
|
padding-right: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-editor-actions {
|
.ai-channel-switcher-actions {
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ai-channel-bulk-actions {
|
.ai-channel-header-actions {
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ai-channel-switcher-field {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head,
|
||||||
|
.ai-channel-form-grid,
|
||||||
|
.ai-channel-reasoning-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-form-section-head,
|
||||||
|
.ai-channel-section-actions {
|
||||||
|
align-items: stretch;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ai-channel-section-actions {
|
||||||
|
justify-content: flex-start;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-reasoning-field-label {
|
.chat-reasoning-field-label {
|
||||||
@@ -9923,6 +10245,54 @@ html[data-theme="dark"] .robot-binding-service-hint-icon {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-option--probe .settings-custom-select-label {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status {
|
||||||
|
display: inline-flex;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
max-width: 42%;
|
||||||
|
padding: 2px 6px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--bg-secondary, #f5f6f8);
|
||||||
|
color: var(--text-secondary, #64748b);
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.3;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status-text {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status-dot {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: currentColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status.ready {
|
||||||
|
background: color-mix(in srgb, var(--success-color, #38a169) 11%, transparent);
|
||||||
|
color: var(--success-color, #38a169);
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status.failed {
|
||||||
|
background: color-mix(in srgb, var(--danger-color, #e53e3e) 10%, transparent);
|
||||||
|
color: var(--danger-color, #e53e3e);
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-custom-select-status.testing {
|
||||||
|
background: color-mix(in srgb, var(--accent-color, #0066ff) 10%, transparent);
|
||||||
|
color: var(--accent-color, #0066ff);
|
||||||
|
}
|
||||||
|
|
||||||
.form-group input:not([type="checkbox"]):not([type="radio"]):focus,
|
.form-group input:not([type="checkbox"]):not([type="radio"]):focus,
|
||||||
.form-group select:focus {
|
.form-group select:focus {
|
||||||
outline: none;
|
outline: none;
|
||||||
@@ -38401,6 +38771,26 @@ html[data-theme="dark"] #page-settings .audit-custom-select-option.is-selected {
|
|||||||
color: #60a5fa !important;
|
color: #60a5fa !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] #page-settings .settings-custom-select-status {
|
||||||
|
background: rgba(148, 163, 184, 0.12);
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] #page-settings .settings-custom-select-status.ready {
|
||||||
|
background: rgba(52, 211, 153, 0.14);
|
||||||
|
color: #34d399;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] #page-settings .settings-custom-select-status.failed {
|
||||||
|
background: rgba(248, 113, 113, 0.14);
|
||||||
|
color: #f87171;
|
||||||
|
}
|
||||||
|
|
||||||
|
html[data-theme="dark"] #page-settings .settings-custom-select-status.testing {
|
||||||
|
background: rgba(96, 165, 250, 0.14);
|
||||||
|
color: #60a5fa;
|
||||||
|
}
|
||||||
|
|
||||||
/* Chat @ tool mention panel dark theme. */
|
/* Chat @ tool mention panel dark theme. */
|
||||||
html[data-theme="dark"] .mention-suggestions {
|
html[data-theme="dark"] .mention-suggestions {
|
||||||
background: #111827 !important;
|
background: #111827 !important;
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 6.6 KiB |
@@ -1106,6 +1106,7 @@
|
|||||||
"importValidRows": "Import valid rows",
|
"importValidRows": "Import valid rows",
|
||||||
"importValidRowsCount": "Import {{count}} valid rows",
|
"importValidRowsCount": "Import {{count}} valid rows",
|
||||||
"importPreviewSummary": "{{total}} rows: {{valid}} valid, {{invalid}} need attention",
|
"importPreviewSummary": "{{total}} rows: {{valid}} valid, {{invalid}} need attention",
|
||||||
|
"importBackendRowError": "Excel row {{row}} (submitted valid asset #{{index}}): {{message}}",
|
||||||
"previewLimited": "Showing the first 100 rows; all {{count}} rows will be processed",
|
"previewLimited": "Showing the first 100 rows; all {{count}} rows will be processed",
|
||||||
"fileTypeInvalid": "Only .xlsx and .csv files are supported",
|
"fileTypeInvalid": "Only .xlsx and .csv files are supported",
|
||||||
"fileTooLarge": "The file must not exceed 100 MB",
|
"fileTooLarge": "The file must not exceed 100 MB",
|
||||||
@@ -2603,23 +2604,43 @@
|
|||||||
"aiChannelNew": "New",
|
"aiChannelNew": "New",
|
||||||
"aiChannelCopy": "Copy",
|
"aiChannelCopy": "Copy",
|
||||||
"aiChannelDelete": "Delete",
|
"aiChannelDelete": "Delete",
|
||||||
"aiChannelHint": "Saved channels appear on the left. Saving writes to ai.channels; the default channel is used by new chats and tasks without an explicit channel.",
|
"aiChannelHint": "Use the dropdown to switch saved channels. Saving writes to ai.channels; the default channel is used by new chats and tasks without an explicit channel.",
|
||||||
"aiChannelSavedList": "Saved channels",
|
"aiChannelSavedList": "Saved channels",
|
||||||
"aiChannelListAria": "AI channel list",
|
"aiChannelListAria": "AI channel list",
|
||||||
"aiChannelEditing": "Editing",
|
"aiChannelEditing": "Editing",
|
||||||
|
"aiChannelFormContext": "Editing the selected channel",
|
||||||
|
"aiChannelFormContextHint": "Saving the form updates this channel configuration.",
|
||||||
|
"aiChannelBulkProbe": "Probe all",
|
||||||
|
"aiChannelBulkProbeTitle": "Check whether all complete channels are available",
|
||||||
|
"aiChannelSelectAria": "Select {name}",
|
||||||
"aiChannelDefaultBadge": "Default",
|
"aiChannelDefaultBadge": "Default",
|
||||||
"aiChannelReady": "Ready",
|
"aiChannelReady": "Ready",
|
||||||
|
"aiChannelReadyWithLatency": "Ready{latency}",
|
||||||
|
"aiChannelComplete": "Complete",
|
||||||
"aiChannelDraft": "Incomplete",
|
"aiChannelDraft": "Incomplete",
|
||||||
"aiChannelDefaultMeta": "Default channel",
|
"aiChannelDefaultMeta": "Default channel",
|
||||||
"aiChannelCustomMeta": "Custom channel",
|
"aiChannelCustomMeta": "Custom channel",
|
||||||
"aiChannelOpenAICompat": "OpenAI compatible",
|
"aiChannelOpenAICompat": "OpenAI compatible",
|
||||||
"aiChannelModelMissing": "Model missing",
|
"aiChannelModelMissing": "Model missing",
|
||||||
"aiChannelName": "Channel name",
|
"aiChannelName": "Channel name",
|
||||||
|
"aiChannelConnectionSection": "Connection",
|
||||||
|
"aiChannelConnectionHint": "Confirm provider, endpoint, key, and model first. Test connection uses these values.",
|
||||||
|
"aiChannelModelSection": "Model and limits",
|
||||||
|
"aiChannelModelHint": "The model name controls routing. Token limits control context and single-response output.",
|
||||||
|
"aiChannelLimitsSection": "Limits",
|
||||||
|
"aiChannelLimitsHint": "Token limits control the context window and single-response output.",
|
||||||
"aiChannelUntitled": "New Channel",
|
"aiChannelUntitled": "New Channel",
|
||||||
"aiChannelDeleteConfirm": "Delete AI channel \"{name}\"?",
|
"aiChannelDeleteConfirm": "Delete AI channel \"{name}\"?",
|
||||||
"aiChannelSaved": "Channel saved",
|
"aiChannelSaved": "Channel saved",
|
||||||
"aiChannelDefaultSaved": "Default channel saved",
|
"aiChannelDefaultSaved": "Default channel saved",
|
||||||
"aiChannelCount": "{count} channel(s) saved",
|
"aiChannelCount": "{count} channel(s) saved",
|
||||||
|
"aiChannelSaving": "Saving channel...",
|
||||||
|
"aiChannelNewUnsaved": "New channel is not saved yet. Fill it in, then click Save changes.",
|
||||||
|
"aiChannelCopyUnsaved": "Copied channel is not saved yet. Review it, then click Save changes.",
|
||||||
|
"aiChannelDeleted": "Channel deleted",
|
||||||
|
"aiChannelProbeNoComplete": "No complete channel to probe. Fill in Base URL, API Key, and Model first.",
|
||||||
|
"aiChannelProbing": "Probing {count} channel(s)...",
|
||||||
|
"aiChannelProbeDone": "Probe complete: {ok}/{total} ready",
|
||||||
"apiProvider": "API Provider",
|
"apiProvider": "API Provider",
|
||||||
"providerOpenAI": "OpenAI / OpenAI-compatible API",
|
"providerOpenAI": "OpenAI / OpenAI-compatible API",
|
||||||
"providerClaude": "Claude (Anthropic Messages API)",
|
"providerClaude": "Claude (Anthropic Messages API)",
|
||||||
@@ -2645,8 +2666,8 @@
|
|||||||
"maxTotalTokensPlaceholder": "120000",
|
"maxTotalTokensPlaceholder": "120000",
|
||||||
"maxTotalTokensHint": "Shared by memory compression and attack chain building. Default: 120000",
|
"maxTotalTokensHint": "Shared by memory compression and attack chain building. Default: 120000",
|
||||||
"maxCompletionTokens": "Max Output Tokens",
|
"maxCompletionTokens": "Max Output Tokens",
|
||||||
"maxCompletionTokensPlaceholder": "16384",
|
"maxCompletionTokensPlaceholder": "32768",
|
||||||
"maxCompletionTokensHint": "Maximum tokens for a single model response. Default: 16384",
|
"maxCompletionTokensHint": "Maximum tokens for a single model response. Default: 32768",
|
||||||
"openaiReasoningTitle": "Reasoning settings",
|
"openaiReasoningTitle": "Reasoning settings",
|
||||||
"openaiReasoningHint": "Default reasoning settings for this AI channel; chat Session settings can override them.",
|
"openaiReasoningHint": "Default reasoning settings for this AI channel; chat Session settings can override them.",
|
||||||
"openaiReasoningProfile": "Wire profile",
|
"openaiReasoningProfile": "Wire profile",
|
||||||
@@ -2795,11 +2816,16 @@
|
|||||||
"visionTimeout": "Timeout (seconds)",
|
"visionTimeout": "Timeout (seconds)",
|
||||||
"visionTestFillRequired": "Enter vision model and ensure API Key is available (or reuse OpenAI)",
|
"visionTestFillRequired": "Enter vision model and ensure API Key is available (or reuse OpenAI)",
|
||||||
"testConnection": "Test Connection",
|
"testConnection": "Test Connection",
|
||||||
"testFillRequired": "Please fill in API Key and Model first",
|
"testFillRequired": "Please fill in Base URL, API Key, and Model first",
|
||||||
"testing": "Testing connection...",
|
"testing": "Testing connection...",
|
||||||
"testSuccess": "Connection successful",
|
"testSuccess": "Connection successful",
|
||||||
"testFailed": "Connection failed",
|
"testFailed": "Connection failed",
|
||||||
"testError": "Test error"
|
"testError": "Test error",
|
||||||
|
"testErrorInvalidApiKey": "API Key is invalid or unauthorized. Check that the key is correct.",
|
||||||
|
"testErrorUnauthorized": "Authentication failed. Check the API Key.",
|
||||||
|
"testErrorForbidden": "Request denied. Check account permissions or model access.",
|
||||||
|
"testErrorModelUnavailable": "Model is unavailable or the model name is incorrect.",
|
||||||
|
"testErrorBaseUrl": "Base URL is unavailable. Check that the endpoint is correct."
|
||||||
},
|
},
|
||||||
"settingsTerminal": {
|
"settingsTerminal": {
|
||||||
"title": "Terminal",
|
"title": "Terminal",
|
||||||
|
|||||||
@@ -1094,6 +1094,7 @@
|
|||||||
"importValidRows": "导入有效数据",
|
"importValidRows": "导入有效数据",
|
||||||
"importValidRowsCount": "导入 {{count}} 条有效数据",
|
"importValidRowsCount": "导入 {{count}} 条有效数据",
|
||||||
"importPreviewSummary": "共 {{total}} 行,{{valid}} 行有效,{{invalid}} 行需修正",
|
"importPreviewSummary": "共 {{total}} 行,{{valid}} 行有效,{{invalid}} 行需修正",
|
||||||
|
"importBackendRowError": "Excel 第 {{row}} 行(提交有效数据第 {{index}} 条):{{message}}",
|
||||||
"previewLimited": "仅展示前 100 行;提交时将处理全部 {{count}} 行",
|
"previewLimited": "仅展示前 100 行;提交时将处理全部 {{count}} 行",
|
||||||
"fileTypeInvalid": "仅支持 .xlsx 和 .csv 文件",
|
"fileTypeInvalid": "仅支持 .xlsx 和 .csv 文件",
|
||||||
"fileTooLarge": "文件不能超过 100 MB",
|
"fileTooLarge": "文件不能超过 100 MB",
|
||||||
@@ -2591,23 +2592,43 @@
|
|||||||
"aiChannelNew": "新增",
|
"aiChannelNew": "新增",
|
||||||
"aiChannelCopy": "复制",
|
"aiChannelCopy": "复制",
|
||||||
"aiChannelDelete": "删除",
|
"aiChannelDelete": "删除",
|
||||||
"aiChannelHint": "已保存的通道会显示在左侧;保存后写入 ai.channels,默认通道用于新对话和未指定通道的任务。",
|
"aiChannelHint": "通过下拉切换已保存通道;保存后写入 ai.channels,默认通道用于新对话和未指定通道的任务。",
|
||||||
"aiChannelSavedList": "已保存通道",
|
"aiChannelSavedList": "已保存通道",
|
||||||
"aiChannelListAria": "AI 通道列表",
|
"aiChannelListAria": "AI 通道列表",
|
||||||
"aiChannelEditing": "正在编辑",
|
"aiChannelEditing": "正在编辑",
|
||||||
|
"aiChannelFormContext": "编辑当前选择的通道",
|
||||||
|
"aiChannelFormContextHint": "表单保存后会更新该通道配置。",
|
||||||
|
"aiChannelBulkProbe": "批量探活",
|
||||||
|
"aiChannelBulkProbeTitle": "检测全部完整通道是否可用",
|
||||||
|
"aiChannelSelectAria": "选择 {name}",
|
||||||
"aiChannelDefaultBadge": "默认",
|
"aiChannelDefaultBadge": "默认",
|
||||||
"aiChannelReady": "可用",
|
"aiChannelReady": "可用",
|
||||||
|
"aiChannelReadyWithLatency": "可用{latency}",
|
||||||
|
"aiChannelComplete": "配置完整",
|
||||||
"aiChannelDraft": "待完善",
|
"aiChannelDraft": "待完善",
|
||||||
"aiChannelDefaultMeta": "默认通道",
|
"aiChannelDefaultMeta": "默认通道",
|
||||||
"aiChannelCustomMeta": "自定义通道",
|
"aiChannelCustomMeta": "自定义通道",
|
||||||
"aiChannelOpenAICompat": "OpenAI 兼容",
|
"aiChannelOpenAICompat": "OpenAI 兼容",
|
||||||
"aiChannelModelMissing": "未填写模型",
|
"aiChannelModelMissing": "未填写模型",
|
||||||
"aiChannelName": "通道名称",
|
"aiChannelName": "通道名称",
|
||||||
|
"aiChannelConnectionSection": "连接信息",
|
||||||
|
"aiChannelConnectionHint": "先确认服务商、地址、密钥和模型,测试连接会使用这些信息。",
|
||||||
|
"aiChannelModelSection": "模型与额度",
|
||||||
|
"aiChannelModelHint": "模型名决定请求路由,Token 上限控制上下文和单次输出。",
|
||||||
|
"aiChannelLimitsSection": "额度设置",
|
||||||
|
"aiChannelLimitsHint": "Token 上限控制上下文窗口和单次输出。",
|
||||||
"aiChannelUntitled": "新通道",
|
"aiChannelUntitled": "新通道",
|
||||||
"aiChannelDeleteConfirm": "确定删除 AI 通道「{name}」吗?",
|
"aiChannelDeleteConfirm": "确定删除 AI 通道「{name}」吗?",
|
||||||
"aiChannelSaved": "通道已保存",
|
"aiChannelSaved": "通道已保存",
|
||||||
"aiChannelDefaultSaved": "已设为默认通道",
|
"aiChannelDefaultSaved": "已设为默认通道",
|
||||||
"aiChannelCount": "已保存 {count} 个通道",
|
"aiChannelCount": "已保存 {count} 个通道",
|
||||||
|
"aiChannelSaving": "正在保存通道...",
|
||||||
|
"aiChannelNewUnsaved": "新通道尚未保存,填写后点击「保存更改」。",
|
||||||
|
"aiChannelCopyUnsaved": "复制的通道尚未保存,确认后点击「保存更改」。",
|
||||||
|
"aiChannelDeleted": "通道已删除",
|
||||||
|
"aiChannelProbeNoComplete": "没有可探活的完整通道,请先填写 Base URL、API Key 和模型",
|
||||||
|
"aiChannelProbing": "正在探活 {count} 个通道...",
|
||||||
|
"aiChannelProbeDone": "探活完成:{ok}/{total} 可用",
|
||||||
"apiProvider": "API 提供商",
|
"apiProvider": "API 提供商",
|
||||||
"providerOpenAI": "OpenAI / 兼容 OpenAI 协议",
|
"providerOpenAI": "OpenAI / 兼容 OpenAI 协议",
|
||||||
"providerClaude": "Claude (Anthropic Messages API)",
|
"providerClaude": "Claude (Anthropic Messages API)",
|
||||||
@@ -2633,8 +2654,8 @@
|
|||||||
"maxTotalTokensPlaceholder": "120000",
|
"maxTotalTokensPlaceholder": "120000",
|
||||||
"maxTotalTokensHint": "内存压缩和攻击链构建共用此配置,默认 120000",
|
"maxTotalTokensHint": "内存压缩和攻击链构建共用此配置,默认 120000",
|
||||||
"maxCompletionTokens": "最大输出 Token 数",
|
"maxCompletionTokens": "最大输出 Token 数",
|
||||||
"maxCompletionTokensPlaceholder": "16384",
|
"maxCompletionTokensPlaceholder": "32768",
|
||||||
"maxCompletionTokensHint": "单次模型回复的输出上限,默认 16384",
|
"maxCompletionTokensHint": "单次模型回复的输出上限,默认 32768",
|
||||||
"openaiReasoningTitle": "推理设置",
|
"openaiReasoningTitle": "推理设置",
|
||||||
"openaiReasoningHint": "作为该 AI 通道的默认推理设置;对话页「会话设置」可覆盖。",
|
"openaiReasoningHint": "作为该 AI 通道的默认推理设置;对话页「会话设置」可覆盖。",
|
||||||
"openaiReasoningProfile": "线路 profile",
|
"openaiReasoningProfile": "线路 profile",
|
||||||
@@ -2783,11 +2804,16 @@
|
|||||||
"visionTimeout": "超时(秒)",
|
"visionTimeout": "超时(秒)",
|
||||||
"visionTestFillRequired": "请填写视觉模型,并确保 API Key 可用(可复用 OpenAI)",
|
"visionTestFillRequired": "请填写视觉模型,并确保 API Key 可用(可复用 OpenAI)",
|
||||||
"testConnection": "测试连接",
|
"testConnection": "测试连接",
|
||||||
"testFillRequired": "请先填写 API Key 和模型",
|
"testFillRequired": "请先填写 Base URL、API Key 和模型",
|
||||||
"testing": "测试中...",
|
"testing": "测试中...",
|
||||||
"testSuccess": "连接成功",
|
"testSuccess": "连接成功",
|
||||||
"testFailed": "连接失败",
|
"testFailed": "连接失败",
|
||||||
"testError": "测试出错"
|
"testError": "测试出错",
|
||||||
|
"testErrorInvalidApiKey": "API Key 无效或无权限,请检查密钥是否填写正确",
|
||||||
|
"testErrorUnauthorized": "认证失败,请检查 API Key",
|
||||||
|
"testErrorForbidden": "请求被拒绝,请检查账号权限或模型访问权限",
|
||||||
|
"testErrorModelUnavailable": "模型不可用或模型名不正确,请检查模型名称",
|
||||||
|
"testErrorBaseUrl": "Base URL 不可用,请检查地址是否正确"
|
||||||
},
|
},
|
||||||
"settingsTerminal": {
|
"settingsTerminal": {
|
||||||
"title": "终端",
|
"title": "终端",
|
||||||
|
|||||||
+26
-2
@@ -57,6 +57,12 @@ function syncAssetSelect(selectOrId) {
|
|||||||
if (typeof syncSettingsCustomSelect === 'function') syncSettingsCustomSelect(select);
|
if (typeof syncSettingsCustomSelect === 'function') syncSettingsCustomSelect(select);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function closeAssetCustomSelects() {
|
||||||
|
if (typeof closeAllSettingsCustomSelects === 'function') {
|
||||||
|
closeAllSettingsCustomSelects();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function assetT(key, fallback, options) {
|
function assetT(key, fallback, options) {
|
||||||
if (window.i18next && typeof window.i18next.t === 'function') {
|
if (window.i18next && typeof window.i18next.t === 'function') {
|
||||||
const value = window.i18next.t(key, options || {});
|
const value = window.i18next.t(key, options || {});
|
||||||
@@ -352,7 +358,8 @@ function renderAssetImportPreview() {
|
|||||||
|
|
||||||
async function submitAssetImport() {
|
async function submitAssetImport() {
|
||||||
if (assetPageState.importBusy) return;
|
if (assetPageState.importBusy) return;
|
||||||
const assets = assetPageState.importRows.filter(row => !row.error).map(row => row.asset);
|
const validRows = assetPageState.importRows.filter(row => !row.error);
|
||||||
|
const assets = validRows.map(row => row.asset);
|
||||||
if (!assets.length) return;
|
if (!assets.length) return;
|
||||||
setAssetImportError('');
|
setAssetImportError('');
|
||||||
setAssetImportBusy(true);
|
setAssetImportBusy(true);
|
||||||
@@ -361,7 +368,7 @@ async function submitAssetImport() {
|
|||||||
method: 'POST', headers: { 'Content-Type': 'application/json' },
|
method: 'POST', headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ assets, source: 'manual-import', source_query: assetPageState.importFileName })
|
body: JSON.stringify({ assets, source: 'manual-import', source_query: assetPageState.importFileName })
|
||||||
});
|
});
|
||||||
if (!response.ok) throw new Error(await assetEditorResponseError(response));
|
if (!response.ok) throw new Error(formatAssetImportSubmitError(await assetEditorResponseError(response), validRows));
|
||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
const invalid = assetPageState.importRows.length - assets.length;
|
const invalid = assetPageState.importRows.length - assets.length;
|
||||||
closeAssetImport(true);
|
closeAssetImport(true);
|
||||||
@@ -378,6 +385,20 @@ async function submitAssetImport() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatAssetImportSubmitError(message, validRows) {
|
||||||
|
const text = String(message || '').trim();
|
||||||
|
const match = text.match(/^第\s*(\d+)\s*个资产无效[::]\s*(.+)$/);
|
||||||
|
if (!match) return text;
|
||||||
|
const assetNumber = Number(match[1]);
|
||||||
|
const row = Array.isArray(validRows) ? validRows[assetNumber - 1] : null;
|
||||||
|
if (!row || !row.rowNumber) return text;
|
||||||
|
return assetT('assets.importBackendRowError', `Excel 第 ${row.rowNumber} 行(提交有效数据第 ${assetNumber} 条): ${match[2]}`, {
|
||||||
|
row: row.rowNumber,
|
||||||
|
index: assetNumber,
|
||||||
|
message: match[2]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function loadAssetOverview() {
|
async function loadAssetOverview() {
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch('/api/assets/stats?days=' + assetOverviewDays);
|
const response = await apiFetch('/api/assets/stats?days=' + assetOverviewDays);
|
||||||
@@ -874,6 +895,7 @@ async function openAssetProjectModal() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function closeAssetProjectModal() {
|
function closeAssetProjectModal() {
|
||||||
|
closeAssetCustomSelects();
|
||||||
if (typeof closeAppModal === 'function') closeAppModal('asset-project-modal');
|
if (typeof closeAppModal === 'function') closeAppModal('asset-project-modal');
|
||||||
else document.getElementById('asset-project-modal').style.display = 'none';
|
else document.getElementById('asset-project-modal').style.display = 'none';
|
||||||
}
|
}
|
||||||
@@ -922,6 +944,7 @@ function openAssetBulkEdit() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function closeAssetBulkEdit() {
|
function closeAssetBulkEdit() {
|
||||||
|
closeAssetCustomSelects();
|
||||||
if (typeof closeAppModal === 'function') closeAppModal('asset-bulk-edit-modal');
|
if (typeof closeAppModal === 'function') closeAppModal('asset-bulk-edit-modal');
|
||||||
else document.getElementById('asset-bulk-edit-modal').style.display = 'none';
|
else document.getElementById('asset-bulk-edit-modal').style.display = 'none';
|
||||||
}
|
}
|
||||||
@@ -1279,6 +1302,7 @@ async function openAssetEditor(indexOrAsset) {
|
|||||||
|
|
||||||
function closeAssetEditor(force) {
|
function closeAssetEditor(force) {
|
||||||
if (!force && assetPageState.editorDirty && !confirm(assetT('assets.discardChanges', '放弃尚未保存的更改吗?'))) return;
|
if (!force && assetPageState.editorDirty && !confirm(assetT('assets.discardChanges', '放弃尚未保存的更改吗?'))) return;
|
||||||
|
closeAssetCustomSelects();
|
||||||
if (typeof closeAppModal === 'function') closeAppModal('asset-editor-modal');
|
if (typeof closeAppModal === 'function') closeAppModal('asset-editor-modal');
|
||||||
else document.getElementById('asset-editor-modal').style.display = 'none';
|
else document.getElementById('asset-editor-modal').style.display = 'none';
|
||||||
const returnFocus = assetPageState.editorReturnFocus;
|
const returnFocus = assetPageState.editorReturnFocus;
|
||||||
|
|||||||
+3
-36
@@ -3572,39 +3572,14 @@ function getCachedToolExecutionSummaries(messageElement) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 过程摘要中的早期/快速工具结果可能没有 executionId,但消息本身会按调用顺序保存 ID。
|
|
||||||
* 合并两份数据,避免渲染摘要时丢失可用的弹窗详情入口。
|
|
||||||
*/
|
|
||||||
function mergeToolExecutionSummariesWithIds(summaries, executionIds) {
|
|
||||||
const normalizedSummaries = Array.isArray(summaries)
|
|
||||||
? summaries.map(normalizeToolExecutionSummaryForButton)
|
|
||||||
: [];
|
|
||||||
const normalizedIds = normalizeMcpExecutionIds(executionIds);
|
|
||||||
const claimedIds = new Set(
|
|
||||||
normalizedSummaries.map((item) => item.executionId).filter(Boolean)
|
|
||||||
);
|
|
||||||
const fallbackIds = normalizedIds.filter((id) => !claimedIds.has(id));
|
|
||||||
let fallbackIndex = 0;
|
|
||||||
return normalizedSummaries.map((item) => {
|
|
||||||
if (item.executionId || fallbackIndex >= fallbackIds.length) return item;
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
executionId: fallbackIds[fallbackIndex++]
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function selectToolExecutionSummariesForButtons(summaries, executionIds) {
|
function selectToolExecutionSummariesForButtons(summaries, executionIds) {
|
||||||
const normalizedSummaries = Array.isArray(summaries)
|
const normalizedSummaries = Array.isArray(summaries)
|
||||||
? summaries.map(normalizeToolExecutionSummaryForButton)
|
? summaries.map(normalizeToolExecutionSummaryForButton)
|
||||||
: [];
|
: [];
|
||||||
const normalizedIds = normalizeMcpExecutionIds(executionIds);
|
const normalizedIds = normalizeMcpExecutionIds(executionIds);
|
||||||
|
if (normalizedSummaries.length > 0) return normalizedSummaries;
|
||||||
if (normalizedIds.length === 0) return normalizedSummaries;
|
if (normalizedIds.length === 0) return normalizedSummaries;
|
||||||
if (normalizedSummaries.length === 0) {
|
return normalizedIds.map((executionId) => normalizeToolExecutionSummaryForButton({ executionId }));
|
||||||
return normalizedIds.map((executionId) => normalizeToolExecutionSummaryForButton({ executionId }));
|
|
||||||
}
|
|
||||||
return mergeToolExecutionSummariesWithIds(normalizedSummaries, normalizedIds);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function setPendingToolExecutionSummaries(messageElement, summaries) {
|
function setPendingToolExecutionSummaries(messageElement, summaries) {
|
||||||
@@ -3819,10 +3794,6 @@ async function findToolExecutionTimelineItem(messageElement, summary, index) {
|
|||||||
if (!target && item.toolCallId) {
|
if (!target && item.toolCallId) {
|
||||||
target = timeline.querySelector('[data-tool-call-id="' + cssEscapeValue(item.toolCallId) + '"]');
|
target = timeline.querySelector('[data-tool-call-id="' + cssEscapeValue(item.toolCallId) + '"]');
|
||||||
}
|
}
|
||||||
if (!target) {
|
|
||||||
const toolItems = timeline.querySelectorAll('.timeline-item-tool_call');
|
|
||||||
target = toolItems[index] || null;
|
|
||||||
}
|
|
||||||
if (!target && item.processDetailId && messageElement.dataset && messageElement.dataset.backendMessageId && typeof window.loadProcessDetailsPaginated === 'function') {
|
if (!target && item.processDetailId && messageElement.dataset && messageElement.dataset.backendMessageId && typeof window.loadProcessDetailsPaginated === 'function') {
|
||||||
await window.loadProcessDetailsPaginated(messageElement.id, messageElement.dataset.backendMessageId, {
|
await window.loadProcessDetailsPaginated(messageElement.id, messageElement.dataset.backendMessageId, {
|
||||||
autoLoadAll: false,
|
autoLoadAll: false,
|
||||||
@@ -3995,11 +3966,7 @@ async function openTaskToolExecutionDetail(messageElement, item, index) {
|
|||||||
let detailItem = item;
|
let detailItem = item;
|
||||||
if (!detailItem.executionId) {
|
if (!detailItem.executionId) {
|
||||||
const refreshedItem = await resolveToolExecutionSummaryForFocus(messageElement, '', index);
|
const refreshedItem = await resolveToolExecutionSummaryForFocus(messageElement, '', index);
|
||||||
const mergedItems = mergeToolExecutionSummariesWithIds(
|
detailItem = refreshedItem || detailItem;
|
||||||
getCachedToolExecutionSummaries(messageElement),
|
|
||||||
getCachedMcpExecutionIds(messageElement)
|
|
||||||
);
|
|
||||||
detailItem = mergedItems[index] || refreshedItem || detailItem;
|
|
||||||
}
|
}
|
||||||
if (detailItem.executionId) {
|
if (detailItem.executionId) {
|
||||||
await showMCPDetail(detailItem.executionId);
|
await showMCPDetail(detailItem.executionId);
|
||||||
|
|||||||
+327
-66
@@ -142,6 +142,19 @@ function syncSettingsCustomSelect(select) {
|
|||||||
|
|
||||||
item.appendChild(check);
|
item.appendChild(check);
|
||||||
item.appendChild(label);
|
item.appendChild(label);
|
||||||
|
|
||||||
|
if (select.id === 'ai-channel-select') {
|
||||||
|
const probeStatus = option.dataset.probeStatus || '';
|
||||||
|
const probeMessage = option.dataset.probeMessage || '';
|
||||||
|
if (probeStatus) {
|
||||||
|
item.classList.add('settings-custom-select-option--probe', `probe-${probeStatus}`);
|
||||||
|
const status = document.createElement('span');
|
||||||
|
status.className = `settings-custom-select-status ${probeStatus}`;
|
||||||
|
status.innerHTML = `<span class="settings-custom-select-status-dot" aria-hidden="true"></span><span class="settings-custom-select-status-text"></span>`;
|
||||||
|
status.querySelector('.settings-custom-select-status-text').textContent = probeMessage || probeStatus;
|
||||||
|
item.appendChild(status);
|
||||||
|
}
|
||||||
|
}
|
||||||
reg.menu.appendChild(item);
|
reg.menu.appendChild(item);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2506,7 +2519,7 @@ function ensureAIConfigShape(cfg) {
|
|||||||
|
|
||||||
function readAIChannelFromMainForm(id) {
|
function readAIChannelFromMainForm(id) {
|
||||||
const prev = currentConfig?.ai?.channels?.[id] || {};
|
const prev = currentConfig?.ai?.channels?.[id] || {};
|
||||||
const maxCompletionTokens = parseInt(document.getElementById('openai-max-completion-tokens')?.value, 10) || 16384;
|
const maxCompletionTokens = parseInt(document.getElementById('openai-max-completion-tokens')?.value, 10) || 32768;
|
||||||
return {
|
return {
|
||||||
...prev,
|
...prev,
|
||||||
name: (document.getElementById('ai-channel-name')?.value || '').trim() || prev.name || id,
|
name: (document.getElementById('ai-channel-name')?.value || '').trim() || prev.name || id,
|
||||||
@@ -2546,7 +2559,7 @@ function writeAIChannelToMainForm(id) {
|
|||||||
const maxTokensEl = document.getElementById('openai-max-total-tokens');
|
const maxTokensEl = document.getElementById('openai-max-total-tokens');
|
||||||
if (maxTokensEl) maxTokensEl.value = ch.max_total_tokens || 120000;
|
if (maxTokensEl) maxTokensEl.value = ch.max_total_tokens || 120000;
|
||||||
const maxCompletionTokensEl = document.getElementById('openai-max-completion-tokens');
|
const maxCompletionTokensEl = document.getElementById('openai-max-completion-tokens');
|
||||||
if (maxCompletionTokensEl) maxCompletionTokensEl.value = ch.max_completion_tokens || 16384;
|
if (maxCompletionTokensEl) maxCompletionTokensEl.value = ch.max_completion_tokens || 32768;
|
||||||
const r = ch.reasoning || {};
|
const r = ch.reasoning || {};
|
||||||
const modeEl = document.getElementById('openai-reasoning-mode');
|
const modeEl = document.getElementById('openai-reasoning-mode');
|
||||||
if (modeEl) modeEl.value = ['auto', 'on', 'off'].includes(String(r.mode || '').toLowerCase()) ? String(r.mode).toLowerCase() : 'auto';
|
if (modeEl) modeEl.value = ['auto', 'on', 'off'].includes(String(r.mode || '').toLowerCase()) ? String(r.mode).toLowerCase() : 'auto';
|
||||||
@@ -2557,6 +2570,100 @@ function writeAIChannelToMainForm(id) {
|
|||||||
const allowEl = document.getElementById('openai-reasoning-allow-client');
|
const allowEl = document.getElementById('openai-reasoning-allow-client');
|
||||||
if (allowEl) allowEl.checked = r.allow_client_reasoning !== false;
|
if (allowEl) allowEl.checked = r.allow_client_reasoning !== false;
|
||||||
syncModelListFetchButtons();
|
syncModelListFetchButtons();
|
||||||
|
syncAIChannelEditorPreview();
|
||||||
|
syncConnectionTestResultForSelectedAIChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
function displayAIChannelName(id, ch) {
|
||||||
|
const name = String(ch?.name || '').trim();
|
||||||
|
if ((name === '新通道' || name === 'New Channel') && !String(ch?.model || '').trim()) {
|
||||||
|
return settingsT('settingsBasic.aiChannelUntitled', name || id);
|
||||||
|
}
|
||||||
|
return name || id;
|
||||||
|
}
|
||||||
|
|
||||||
|
function aiChannelSelectLabel(id, ch) {
|
||||||
|
const marker = id === currentConfig?.ai?.default_channel ? ' *' : '';
|
||||||
|
return `${displayAIChannelName(id, ch)}${marker} · ${ch?.model || '-'}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function aiChannelOptionProbeMeta(id) {
|
||||||
|
const probe = aiChannelProbeResults[id];
|
||||||
|
if (!probe) return null;
|
||||||
|
const status = probe.status || '';
|
||||||
|
if (!['testing', 'ready', 'failed'].includes(status)) return null;
|
||||||
|
return {
|
||||||
|
status,
|
||||||
|
message: probe.message || (status === 'ready'
|
||||||
|
? settingsT('settingsBasic.aiChannelReady', '可用')
|
||||||
|
: status === 'testing'
|
||||||
|
? settingsT('settingsBasic.testing', '测试中...')
|
||||||
|
: settingsT('settingsBasic.testFailed', '连接失败'))
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateAIChannelSelectOption(id) {
|
||||||
|
const select = document.getElementById('ai-channel-select');
|
||||||
|
if (!select || !currentConfig?.ai?.channels) return;
|
||||||
|
const channelId = normalizeAIChannelId(id || selectedAIChannelId || currentConfig.ai.default_channel || 'default');
|
||||||
|
const ch = currentConfig.ai.channels[channelId];
|
||||||
|
if (!ch) return;
|
||||||
|
const opt = Array.from(select.options).find((option) => option.value === channelId);
|
||||||
|
if (opt) {
|
||||||
|
opt.textContent = aiChannelSelectLabel(channelId, ch);
|
||||||
|
const probeMeta = aiChannelOptionProbeMeta(channelId);
|
||||||
|
if (probeMeta) {
|
||||||
|
opt.dataset.probeStatus = probeMeta.status;
|
||||||
|
opt.dataset.probeMessage = probeMeta.message;
|
||||||
|
} else {
|
||||||
|
delete opt.dataset.probeStatus;
|
||||||
|
delete opt.dataset.probeMessage;
|
||||||
|
}
|
||||||
|
if (channelId === selectedAIChannelId) {
|
||||||
|
select.value = channelId;
|
||||||
|
select.selectedIndex = opt.index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (typeof syncSettingsCustomSelect === 'function') {
|
||||||
|
syncSettingsCustomSelect(select);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncSelectedAIChannelUI() {
|
||||||
|
updateAIChannelSelectOption(selectedAIChannelId);
|
||||||
|
updateAIChannelEditorChrome(selectedAIChannelId);
|
||||||
|
renderAIChannelList();
|
||||||
|
syncConnectionTestResultForSelectedAIChannel();
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncAIChannelEditorPreview() {
|
||||||
|
if (!currentConfig?.ai?.channels || !selectedAIChannelId || !currentConfig.ai.channels[selectedAIChannelId]) return;
|
||||||
|
const id = normalizeAIChannelId(selectedAIChannelId);
|
||||||
|
const prev = currentConfig.ai.channels[id] || {};
|
||||||
|
const next = readAIChannelFromMainForm(id);
|
||||||
|
const connectionChanged = ['provider', 'base_url', 'api_key', 'model'].some((key) => String(prev[key] || '') !== String(next[key] || ''));
|
||||||
|
if (connectionChanged) {
|
||||||
|
delete aiChannelProbeResults[id];
|
||||||
|
}
|
||||||
|
currentConfig.ai.channels[id] = next;
|
||||||
|
syncSelectedAIChannelUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
function bindAIChannelEditorPreviewSync() {
|
||||||
|
const ids = [
|
||||||
|
'ai-channel-name',
|
||||||
|
'openai-provider',
|
||||||
|
'openai-api-key',
|
||||||
|
'openai-base-url',
|
||||||
|
'openai-model'
|
||||||
|
];
|
||||||
|
ids.forEach((fieldId) => {
|
||||||
|
const el = document.getElementById(fieldId);
|
||||||
|
if (!el || el.dataset.aiChannelPreviewBound === '1') return;
|
||||||
|
el.dataset.aiChannelPreviewBound = '1';
|
||||||
|
const eventName = el.tagName === 'SELECT' ? 'change' : 'input';
|
||||||
|
el.addEventListener(eventName, syncAIChannelEditorPreview);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderAIChannelSelect() {
|
function renderAIChannelSelect() {
|
||||||
@@ -2570,16 +2677,24 @@ function renderAIChannelSelect() {
|
|||||||
const ch = currentConfig.ai.channels[id] || {};
|
const ch = currentConfig.ai.channels[id] || {};
|
||||||
const opt = document.createElement('option');
|
const opt = document.createElement('option');
|
||||||
opt.value = id;
|
opt.value = id;
|
||||||
const marker = id === currentConfig.ai.default_channel ? ' *' : '';
|
opt.textContent = aiChannelSelectLabel(id, ch);
|
||||||
opt.textContent = `${ch.name || id}${marker} · ${ch.model || '-'}`;
|
const probeMeta = aiChannelOptionProbeMeta(id);
|
||||||
|
if (probeMeta) {
|
||||||
|
opt.dataset.probeStatus = probeMeta.status;
|
||||||
|
opt.dataset.probeMessage = probeMeta.message;
|
||||||
|
}
|
||||||
select.appendChild(opt);
|
select.appendChild(opt);
|
||||||
});
|
});
|
||||||
selectedAIChannelId = selectedAIChannelId && currentConfig.ai.channels[selectedAIChannelId]
|
selectedAIChannelId = selectedAIChannelId && currentConfig.ai.channels[selectedAIChannelId]
|
||||||
? selectedAIChannelId
|
? selectedAIChannelId
|
||||||
: currentConfig.ai.default_channel;
|
: currentConfig.ai.default_channel;
|
||||||
select.value = selectedAIChannelId;
|
select.value = selectedAIChannelId;
|
||||||
renderAIChannelList(ids);
|
updateAIChannelSelectOption(selectedAIChannelId);
|
||||||
|
if (typeof syncSettingsCustomSelect === 'function') {
|
||||||
|
syncSettingsCustomSelect(select);
|
||||||
|
}
|
||||||
updateAIChannelEditorChrome(selectedAIChannelId);
|
updateAIChannelEditorChrome(selectedAIChannelId);
|
||||||
|
renderAIChannelList(ids);
|
||||||
const countLabel = typeof window.t === 'function'
|
const countLabel = typeof window.t === 'function'
|
||||||
? window.t('settingsBasic.aiChannelCount').replace('{count}', String(ids.length))
|
? window.t('settingsBasic.aiChannelCount').replace('{count}', String(ids.length))
|
||||||
: `已保存 ${ids.length} 个通道`;
|
: `已保存 ${ids.length} 个通道`;
|
||||||
@@ -2621,7 +2736,7 @@ function renderAIChannelList(ids) {
|
|||||||
checkbox.type = 'checkbox';
|
checkbox.type = 'checkbox';
|
||||||
checkbox.className = 'ai-channel-bulk-check';
|
checkbox.className = 'ai-channel-bulk-check';
|
||||||
checkbox.checked = selectedAIChannelBulkIds.has(id);
|
checkbox.checked = selectedAIChannelBulkIds.has(id);
|
||||||
checkbox.setAttribute('aria-label', `选择 ${ch.name || id}`);
|
checkbox.setAttribute('aria-label', settingsT('settingsBasic.aiChannelSelectAria', '选择 {name}').replace('{name}', displayAIChannelName(id, ch)));
|
||||||
checkbox.onclick = (event) => {
|
checkbox.onclick = (event) => {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
if (checkbox.checked) {
|
if (checkbox.checked) {
|
||||||
@@ -2631,11 +2746,12 @@ function renderAIChannelList(ids) {
|
|||||||
}
|
}
|
||||||
item.classList.toggle('checked', checkbox.checked);
|
item.classList.toggle('checked', checkbox.checked);
|
||||||
};
|
};
|
||||||
|
const displayName = displayAIChannelName(id, ch);
|
||||||
const defaultBadge = isDefault ? `<span class="ai-channel-badge">${escapeAIChannelHtml(settingsT('settingsBasic.aiChannelDefaultBadge', '默认'))}</span>` : '';
|
const defaultBadge = isDefault ? `<span class="ai-channel-badge">${escapeAIChannelHtml(settingsT('settingsBasic.aiChannelDefaultBadge', '默认'))}</span>` : '';
|
||||||
let statusText = isComplete
|
let statusText = isComplete
|
||||||
? settingsT('settingsBasic.aiChannelReady', '可用')
|
? settingsT('settingsBasic.aiChannelComplete', '配置完整')
|
||||||
: settingsT('settingsBasic.aiChannelDraft', '待完善');
|
: settingsT('settingsBasic.aiChannelDraft', '待完善');
|
||||||
let statusClass = isComplete ? 'ready' : 'draft';
|
let statusClass = isComplete ? 'complete' : 'draft';
|
||||||
if (probe) {
|
if (probe) {
|
||||||
statusText = probe.message || statusText;
|
statusText = probe.message || statusText;
|
||||||
statusClass = probe.status || statusClass;
|
statusClass = probe.status || statusClass;
|
||||||
@@ -2645,7 +2761,7 @@ function renderAIChannelList(ids) {
|
|||||||
body.innerHTML = `
|
body.innerHTML = `
|
||||||
<div class="ai-channel-list-main">
|
<div class="ai-channel-list-main">
|
||||||
<span class="ai-channel-status-dot ${statusClass}" aria-hidden="true"></span>
|
<span class="ai-channel-status-dot ${statusClass}" aria-hidden="true"></span>
|
||||||
<strong title="${escapeAIChannelHtml(ch.name || id)}">${escapeAIChannelHtml(ch.name || id)}</strong>
|
<strong title="${escapeAIChannelHtml(displayName)}">${escapeAIChannelHtml(displayName)}</strong>
|
||||||
${defaultBadge}
|
${defaultBadge}
|
||||||
</div>
|
</div>
|
||||||
<div class="ai-channel-list-meta" title="${escapeAIChannelHtml(ch.model || '-')} · ${escapeAIChannelHtml(channelHostLabel(ch.base_url))}">${escapeAIChannelHtml(ch.model || '-')} · ${escapeAIChannelHtml(channelHostLabel(ch.base_url))}</div>
|
<div class="ai-channel-list-meta" title="${escapeAIChannelHtml(ch.model || '-')} · ${escapeAIChannelHtml(channelHostLabel(ch.base_url))}">${escapeAIChannelHtml(ch.model || '-')} · ${escapeAIChannelHtml(channelHostLabel(ch.base_url))}</div>
|
||||||
@@ -2672,19 +2788,36 @@ function updateAIChannelEditorChrome(id) {
|
|||||||
const ai = ensureAIConfigShape(currentConfig || {});
|
const ai = ensureAIConfigShape(currentConfig || {});
|
||||||
const channelId = normalizeAIChannelId(id || ai.default_channel || 'default');
|
const channelId = normalizeAIChannelId(id || ai.default_channel || 'default');
|
||||||
const ch = ai.channels[channelId] || {};
|
const ch = ai.channels[channelId] || {};
|
||||||
|
const isDefault = channelId === ai.default_channel;
|
||||||
|
const isComplete = !validateSelectedAIChannelPayload(ch);
|
||||||
|
const probe = aiChannelProbeResults[channelId] || null;
|
||||||
const title = document.getElementById('ai-channel-editor-title');
|
const title = document.getElementById('ai-channel-editor-title');
|
||||||
const meta = document.getElementById('ai-channel-editor-meta');
|
const meta = document.getElementById('ai-channel-editor-meta');
|
||||||
if (title) title.textContent = ch.name || channelId;
|
if (title) {
|
||||||
|
title.textContent = settingsT('settingsBasic.aiChannelFormContextHint', '表单保存后会更新该通道配置。');
|
||||||
|
}
|
||||||
if (meta) {
|
if (meta) {
|
||||||
const parts = [
|
const provider = ch.provider === 'claude' ? 'Claude' : settingsT('settingsBasic.aiChannelOpenAICompat', 'OpenAI 兼容');
|
||||||
channelId === ai.default_channel
|
const statusText = probe?.message || (isComplete
|
||||||
? settingsT('settingsBasic.aiChannelDefaultMeta', '默认通道')
|
? settingsT('settingsBasic.aiChannelComplete', '配置完整')
|
||||||
: settingsT('settingsBasic.aiChannelCustomMeta', '自定义通道'),
|
: settingsT('settingsBasic.aiChannelDraft', '待完善'));
|
||||||
ch.provider === 'claude' ? 'Claude' : settingsT('settingsBasic.aiChannelOpenAICompat', 'OpenAI 兼容'),
|
const statusClass = probe?.status || (isComplete ? 'complete' : 'draft');
|
||||||
ch.model || settingsT('settingsBasic.aiChannelModelMissing', '未填写模型'),
|
const chips = [
|
||||||
channelHostLabel(ch.base_url)
|
{
|
||||||
].filter(Boolean);
|
label: isDefault
|
||||||
meta.textContent = parts.join(' / ');
|
? settingsT('settingsBasic.aiChannelDefaultMeta', '默认通道')
|
||||||
|
: settingsT('settingsBasic.aiChannelCustomMeta', '自定义通道'),
|
||||||
|
className: isDefault ? 'default' : ''
|
||||||
|
},
|
||||||
|
{ label: provider },
|
||||||
|
{ label: ch.model || settingsT('settingsBasic.aiChannelModelMissing', '未填写模型') },
|
||||||
|
{ label: channelHostLabel(ch.base_url) },
|
||||||
|
{ label: statusText, className: statusClass }
|
||||||
|
].filter((chip) => chip.label);
|
||||||
|
meta.innerHTML = chips.map((chip) => {
|
||||||
|
const className = chip.className ? ` ${escapeAIChannelHtml(chip.className)}` : '';
|
||||||
|
return `<span class="ai-channel-editor-chip${className}" title="${escapeAIChannelHtml(chip.label)}">${escapeAIChannelHtml(chip.label)}</span>`;
|
||||||
|
}).join('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2699,6 +2832,41 @@ function validateSelectedAIChannelPayload(ch) {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resolveSavedAIChannelId(ai, preferredId, preferredPayload) {
|
||||||
|
const channels = ai?.channels || {};
|
||||||
|
const normalizedPreferred = normalizeAIChannelId(preferredId || '');
|
||||||
|
if (normalizedPreferred && channels[normalizedPreferred]) return normalizedPreferred;
|
||||||
|
|
||||||
|
const payload = preferredPayload || {};
|
||||||
|
const targetName = String(payload.name || '').trim();
|
||||||
|
const targetModel = String(payload.model || '').trim();
|
||||||
|
const targetBaseUrl = String(payload.base_url || '').trim();
|
||||||
|
const targetProvider = String(payload.provider || '').trim();
|
||||||
|
const ids = Object.keys(channels).sort();
|
||||||
|
const matched = ids.find((id) => {
|
||||||
|
const ch = channels[id] || {};
|
||||||
|
return String(ch.name || '').trim() === targetName
|
||||||
|
&& String(ch.model || '').trim() === targetModel
|
||||||
|
&& String(ch.base_url || '').trim() === targetBaseUrl
|
||||||
|
&& String(ch.provider || '').trim() === targetProvider;
|
||||||
|
});
|
||||||
|
return matched || ai?.default_channel || ids[0] || normalizedPreferred || 'default';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshAIChannelsFromServer(preferredId, preferredPayload) {
|
||||||
|
const response = await apiFetch('/api/config');
|
||||||
|
if (!response.ok) return false;
|
||||||
|
currentConfig = await response.json();
|
||||||
|
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
||||||
|
selectedAIChannelId = resolveSavedAIChannelId(currentConfig.ai, preferredId, preferredPayload);
|
||||||
|
renderAIChannelSelect();
|
||||||
|
writeAIChannelToMainForm(selectedAIChannelId);
|
||||||
|
if (typeof populateChatAIChannelSelect === 'function') {
|
||||||
|
populateChatAIChannelSelect(currentConfig.ai);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
async function persistAIChannelsToServer(successMessage, options = {}) {
|
async function persistAIChannelsToServer(successMessage, options = {}) {
|
||||||
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return false;
|
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return false;
|
||||||
if (!currentConfig) currentConfig = {};
|
if (!currentConfig) currentConfig = {};
|
||||||
@@ -2714,7 +2882,7 @@ async function persistAIChannelsToServer(successMessage, options = {}) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
renderAIChannelSelect();
|
renderAIChannelSelect();
|
||||||
showAIChannelSaveHint('正在保存通道...', true);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelSaving', '正在保存通道...'), true);
|
||||||
try {
|
try {
|
||||||
const shouldMergeLatest = options.mergeLatest !== false;
|
const shouldMergeLatest = options.mergeLatest !== false;
|
||||||
const latestResponse = shouldMergeLatest ? await apiFetch('/api/config') : null;
|
const latestResponse = shouldMergeLatest ? await apiFetch('/api/config') : null;
|
||||||
@@ -2744,17 +2912,7 @@ async function persistAIChannelsToServer(successMessage, options = {}) {
|
|||||||
const error = await applyResponse.json().catch(() => ({}));
|
const error = await applyResponse.json().catch(() => ({}));
|
||||||
throw new Error(error.error || '应用通道失败');
|
throw new Error(error.error || '应用通道失败');
|
||||||
}
|
}
|
||||||
const response = await apiFetch('/api/config');
|
await refreshAIChannelsFromServer(id, channelPayload);
|
||||||
if (response.ok) {
|
|
||||||
currentConfig = await response.json();
|
|
||||||
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
|
||||||
selectedAIChannelId = currentConfig.ai.channels[id] ? id : currentConfig.ai.default_channel;
|
|
||||||
renderAIChannelSelect();
|
|
||||||
writeAIChannelToMainForm(selectedAIChannelId);
|
|
||||||
if (typeof populateChatAIChannelSelect === 'function') {
|
|
||||||
populateChatAIChannelSelect(currentConfig.ai);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
showAIChannelSaveHint(successMessage || '通道已保存', true);
|
showAIChannelSaveHint(successMessage || '通道已保存', true);
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -2768,7 +2926,7 @@ async function persistAIConfigOnlyToServer(successMessage) {
|
|||||||
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return false;
|
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return false;
|
||||||
if (!currentConfig) return false;
|
if (!currentConfig) return false;
|
||||||
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
||||||
showAIChannelSaveHint('正在保存通道...', true);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelSaving', '正在保存通道...'), true);
|
||||||
try {
|
try {
|
||||||
const updateResponse = await apiFetch('/api/config', {
|
const updateResponse = await apiFetch('/api/config', {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
@@ -2784,9 +2942,7 @@ async function persistAIConfigOnlyToServer(successMessage) {
|
|||||||
const error = await applyResponse.json().catch(() => ({}));
|
const error = await applyResponse.json().catch(() => ({}));
|
||||||
throw new Error(error.error || '应用通道失败');
|
throw new Error(error.error || '应用通道失败');
|
||||||
}
|
}
|
||||||
if (typeof populateChatAIChannelSelect === 'function') {
|
await refreshAIChannelsFromServer(selectedAIChannelId);
|
||||||
populateChatAIChannelSelect(currentConfig.ai);
|
|
||||||
}
|
|
||||||
showAIChannelSaveHint(successMessage || '通道已保存', true);
|
showAIChannelSaveHint(successMessage || '通道已保存', true);
|
||||||
return true;
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -2844,13 +3000,13 @@ function createAIChannelFromForm() {
|
|||||||
base_url: '',
|
base_url: '',
|
||||||
model: '',
|
model: '',
|
||||||
max_total_tokens: 120000,
|
max_total_tokens: 120000,
|
||||||
max_completion_tokens: 16384,
|
max_completion_tokens: 32768,
|
||||||
reasoning: { mode: 'auto', effort: '', profile: 'auto', allow_client_reasoning: true }
|
reasoning: { mode: 'auto', effort: '', profile: 'auto', allow_client_reasoning: true }
|
||||||
};
|
};
|
||||||
selectedAIChannelId = id;
|
selectedAIChannelId = id;
|
||||||
renderAIChannelSelect();
|
renderAIChannelSelect();
|
||||||
writeAIChannelToMainForm(id);
|
writeAIChannelToMainForm(id);
|
||||||
showAIChannelSaveHint('新通道尚未保存,填写后点击「保存更改」。', true);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelNewUnsaved', '新通道尚未保存,填写后点击「保存更改」。'), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function copyAIChannelFromForm() {
|
function copyAIChannelFromForm() {
|
||||||
@@ -2862,10 +3018,10 @@ function copyAIChannelFromForm() {
|
|||||||
selectedAIChannelId = id;
|
selectedAIChannelId = id;
|
||||||
renderAIChannelSelect();
|
renderAIChannelSelect();
|
||||||
writeAIChannelToMainForm(id);
|
writeAIChannelToMainForm(id);
|
||||||
showAIChannelSaveHint('复制的通道尚未保存,确认后点击「保存更改」。', true);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelCopyUnsaved', '复制的通道尚未保存,确认后点击「保存更改」。'), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteSelectedAIChannel() {
|
async function deleteSelectedAIChannel() {
|
||||||
if (!currentConfig) return;
|
if (!currentConfig) return;
|
||||||
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
currentConfig.ai = ensureAIConfigShape(currentConfig);
|
||||||
const ids = Object.keys(currentConfig.ai.channels || {});
|
const ids = Object.keys(currentConfig.ai.channels || {});
|
||||||
@@ -2883,10 +3039,21 @@ function deleteSelectedAIChannel() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
delete currentConfig.ai.channels[id];
|
delete currentConfig.ai.channels[id];
|
||||||
currentConfig.ai.default_channel = Object.keys(currentConfig.ai.channels).sort()[0];
|
delete aiChannelProbeResults[id];
|
||||||
|
selectedAIChannelBulkIds.delete(id);
|
||||||
|
|
||||||
|
const remainingIds = Object.keys(currentConfig.ai.channels || {}).sort();
|
||||||
|
if (!currentConfig.ai.channels[currentConfig.ai.default_channel]) {
|
||||||
|
currentConfig.ai.default_channel = remainingIds[0];
|
||||||
|
}
|
||||||
|
selectedAIChannelId = currentConfig.ai.default_channel || remainingIds[0];
|
||||||
renderAIChannelSelect();
|
renderAIChannelSelect();
|
||||||
writeAIChannelToMainForm(currentConfig.ai.default_channel);
|
writeAIChannelToMainForm(selectedAIChannelId);
|
||||||
persistAIChannelsToServer('通道已删除', { mergeLatest: false });
|
const saved = await persistAIConfigOnlyToServer(settingsT('settingsBasic.aiChannelDeleted', '通道已删除'));
|
||||||
|
if (saved) {
|
||||||
|
renderAIChannelSelect();
|
||||||
|
writeAIChannelToMainForm(selectedAIChannelId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectedOrAllAIChannelIdsForProbe() {
|
function selectedOrAllAIChannelIdsForProbe() {
|
||||||
@@ -2904,12 +3071,13 @@ async function probeSelectedAIChannels() {
|
|||||||
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return;
|
if (typeof requirePermission === 'function' && !requirePermission('config:write')) return;
|
||||||
const ids = selectedOrAllAIChannelIdsForProbe();
|
const ids = selectedOrAllAIChannelIdsForProbe();
|
||||||
if (!ids.length) {
|
if (!ids.length) {
|
||||||
alert('没有可探活的完整通道,请先填写 Base URL、API Key 和模型');
|
alert(settingsT('settingsBasic.aiChannelProbeNoComplete', '没有可探活的完整通道,请先填写 Base URL、API Key 和模型'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
showAIChannelSaveHint(`正在探活 ${ids.length} 个通道...`, true);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelProbing', '正在探活 {count} 个通道...').replace('{count}', String(ids.length)), true);
|
||||||
ids.forEach((id) => {
|
ids.forEach((id) => {
|
||||||
aiChannelProbeResults[id] = { status: 'testing', message: '测试中...' };
|
aiChannelProbeResults[id] = { status: 'testing', message: settingsT('settingsBasic.testing', '测试中...') };
|
||||||
|
updateAIChannelSelectOption(id);
|
||||||
});
|
});
|
||||||
renderAIChannelList();
|
renderAIChannelList();
|
||||||
let okCount = 0;
|
let okCount = 0;
|
||||||
@@ -2933,13 +3101,14 @@ async function probeSelectedAIChannels() {
|
|||||||
if (response.ok && result.success) {
|
if (response.ok && result.success) {
|
||||||
okCount += 1;
|
okCount += 1;
|
||||||
const latency = result.latency_ms ? ` ${result.latency_ms}ms` : '';
|
const latency = result.latency_ms ? ` ${result.latency_ms}ms` : '';
|
||||||
aiChannelProbeResults[id] = { status: 'ready', message: `可用${latency}` };
|
aiChannelProbeResults[id] = { status: 'ready', message: settingsT('settingsBasic.aiChannelReadyWithLatency', '可用{latency}').replace('{latency}', latency) };
|
||||||
} else {
|
} else {
|
||||||
aiChannelProbeResults[id] = { status: 'failed', message: (result.error || '连接失败') };
|
aiChannelProbeResults[id] = { status: 'failed', message: formatConnectionTestError(result.error || settingsT('settingsBasic.testFailed', '连接失败')).message };
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
aiChannelProbeResults[id] = { status: 'failed', message: error.message || '测试出错' };
|
aiChannelProbeResults[id] = { status: 'failed', message: formatConnectionTestError(error.message || settingsT('settingsBasic.testError', '测试出错')).message };
|
||||||
}
|
}
|
||||||
|
updateAIChannelSelectOption(id);
|
||||||
renderAIChannelList();
|
renderAIChannelList();
|
||||||
}
|
}
|
||||||
const workers = Array.from({ length: Math.min(AI_CHANNEL_PROBE_CONCURRENCY, ids.length) }, async function () {
|
const workers = Array.from({ length: Math.min(AI_CHANNEL_PROBE_CONCURRENCY, ids.length) }, async function () {
|
||||||
@@ -2948,7 +3117,7 @@ async function probeSelectedAIChannels() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
await Promise.all(workers);
|
await Promise.all(workers);
|
||||||
showAIChannelSaveHint(`探活完成:${okCount}/${ids.length} 可用`, okCount === ids.length);
|
showAIChannelSaveHint(settingsT('settingsBasic.aiChannelProbeDone', '探活完成:{ok}/{total} 可用').replace('{ok}', String(okCount)).replace('{total}', String(ids.length)), okCount === ids.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function deleteCheckedAIChannels() {
|
async function deleteCheckedAIChannels() {
|
||||||
@@ -2997,7 +3166,17 @@ if (typeof window !== 'undefined') {
|
|||||||
window.deleteCheckedAIChannels = deleteCheckedAIChannels;
|
window.deleteCheckedAIChannels = deleteCheckedAIChannels;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof document !== 'undefined' && !document.__aiChannelI18nBound) {
|
||||||
|
document.__aiChannelI18nBound = true;
|
||||||
|
document.addEventListener('languagechange', function () {
|
||||||
|
if (!currentConfig?.ai) return;
|
||||||
|
renderAIChannelSelect();
|
||||||
|
updateAIChannelEditorChrome(selectedAIChannelId || currentConfig.ai.default_channel);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function initModelListControls() {
|
function initModelListControls() {
|
||||||
|
bindAIChannelEditorPreviewSync();
|
||||||
const providerEl = document.getElementById('openai-provider');
|
const providerEl = document.getElementById('openai-provider');
|
||||||
if (providerEl && !providerEl.dataset.modelListBound) {
|
if (providerEl && !providerEl.dataset.modelListBound) {
|
||||||
providerEl.dataset.modelListBound = '1';
|
providerEl.dataset.modelListBound = '1';
|
||||||
@@ -3048,6 +3227,9 @@ function bindModelSelect(scope) {
|
|||||||
if (!select.value) return;
|
if (!select.value) return;
|
||||||
const input = document.getElementById(inputId);
|
const input = document.getElementById(inputId);
|
||||||
if (input) input.value = select.value;
|
if (input) input.value = select.value;
|
||||||
|
if (scope === 'openai') {
|
||||||
|
syncAIChannelEditorPreview();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3381,10 +3563,10 @@ async function testHitlAuditModelConnection() {
|
|||||||
const resultEl = document.getElementById('test-hitl-audit-model-result');
|
const resultEl = document.getElementById('test-hitl-audit-model-result');
|
||||||
const cfg = collectHitlAuditModelEffectiveConfig();
|
const cfg = collectHitlAuditModelEffectiveConfig();
|
||||||
|
|
||||||
if (!cfg.api_key || !cfg.model) {
|
if (!cfg.base_url || !cfg.api_key || !cfg.model) {
|
||||||
if (resultEl) {
|
if (resultEl) {
|
||||||
resultEl.style.color = 'var(--danger-color, #e53e3e)';
|
resultEl.style.color = 'var(--danger-color, #e53e3e)';
|
||||||
resultEl.textContent = typeof window.t === 'function' ? window.t('settingsBasic.testFillRequired') : '请先填写 API Key 和模型';
|
resultEl.textContent = typeof window.t === 'function' ? window.t('settingsBasic.testFillRequired') : '请先填写 Base URL、API Key 和模型';
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -3430,6 +3612,59 @@ async function testHitlAuditModelConnection() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatConnectionTestError(errorText) {
|
||||||
|
const raw = String(errorText || '').trim() || settingsT('settingsBasic.testError', '测试出错');
|
||||||
|
return {
|
||||||
|
message: raw,
|
||||||
|
detail: raw
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function setConnectionTestResult(resultEl, state, message, title) {
|
||||||
|
if (!resultEl) return;
|
||||||
|
resultEl.classList.remove('is-error', 'is-success', 'is-muted', 'is-visible');
|
||||||
|
resultEl.style.color = '';
|
||||||
|
resultEl.textContent = message || '';
|
||||||
|
resultEl.title = title || '';
|
||||||
|
if (message) {
|
||||||
|
resultEl.classList.add('is-visible', state || 'is-muted');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncConnectionTestResultForSelectedAIChannel() {
|
||||||
|
const resultEl = document.getElementById('test-openai-result');
|
||||||
|
if (!resultEl) return;
|
||||||
|
const channelId = normalizeAIChannelId(selectedAIChannelId || currentConfig?.ai?.default_channel || 'default');
|
||||||
|
const probe = aiChannelProbeResults[channelId];
|
||||||
|
if (!probe) {
|
||||||
|
setConnectionTestResult(resultEl, '', '');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const state = probe.status === 'ready'
|
||||||
|
? 'is-success'
|
||||||
|
: probe.status === 'failed'
|
||||||
|
? 'is-error'
|
||||||
|
: 'is-muted';
|
||||||
|
let message = probe.message || '';
|
||||||
|
const fillRequiredMessage = settingsT('settingsBasic.testFillRequired', '请先填写 Base URL、API Key 和模型');
|
||||||
|
const failedPrefix = (typeof window.t === 'function' ? window.t('settingsBasic.testFailed') : '连接失败') + ': ';
|
||||||
|
if (probe.status === 'failed' && message && message !== fillRequiredMessage && !message.startsWith(failedPrefix)) {
|
||||||
|
message = failedPrefix + message;
|
||||||
|
}
|
||||||
|
setConnectionTestResult(resultEl, state, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showConnectionTestFailure(resultEl, errorText) {
|
||||||
|
if (!resultEl) return;
|
||||||
|
const formatted = formatConnectionTestError(errorText);
|
||||||
|
setConnectionTestResult(
|
||||||
|
resultEl,
|
||||||
|
'is-error',
|
||||||
|
(typeof window.t === 'function' ? window.t('settingsBasic.testFailed') : '连接失败') + ': ' + formatted.message,
|
||||||
|
formatted.detail || formatted.message
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// 测试OpenAI连接
|
// 测试OpenAI连接
|
||||||
async function testOpenAIConnection() {
|
async function testOpenAIConnection() {
|
||||||
const btn = document.getElementById('test-openai-btn');
|
const btn = document.getElementById('test-openai-btn');
|
||||||
@@ -3439,17 +3674,29 @@ async function testOpenAIConnection() {
|
|||||||
const baseUrl = document.getElementById('openai-base-url').value.trim();
|
const baseUrl = document.getElementById('openai-base-url').value.trim();
|
||||||
const apiKey = document.getElementById('openai-api-key').value.trim();
|
const apiKey = document.getElementById('openai-api-key').value.trim();
|
||||||
const model = document.getElementById('openai-model').value.trim();
|
const model = document.getElementById('openai-model').value.trim();
|
||||||
|
const channelId = normalizeAIChannelId(selectedAIChannelId || currentConfig?.ai?.default_channel || 'default');
|
||||||
|
const isTestingSameChannel = () => normalizeAIChannelId(selectedAIChannelId || currentConfig?.ai?.default_channel || 'default') === channelId;
|
||||||
|
|
||||||
if (!apiKey || !model) {
|
if (!baseUrl || !apiKey || !model) {
|
||||||
resultEl.style.color = 'var(--danger-color, #e53e3e)';
|
const message = typeof window.t === 'function' ? window.t('settingsBasic.testFillRequired') : '请先填写 Base URL、API Key 和模型';
|
||||||
resultEl.textContent = typeof window.t === 'function' ? window.t('settingsBasic.testFillRequired') : '请先填写 API Key 和模型';
|
aiChannelProbeResults[channelId] = { status: 'failed', message };
|
||||||
|
if (isTestingSameChannel()) {
|
||||||
|
setConnectionTestResult(resultEl, 'is-error', message);
|
||||||
|
}
|
||||||
|
syncSelectedAIChannelUI();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
btn.style.pointerEvents = 'none';
|
if (btn) {
|
||||||
btn.style.opacity = '0.5';
|
btn.style.pointerEvents = 'none';
|
||||||
resultEl.style.color = 'var(--text-muted, #888)';
|
btn.style.opacity = '0.5';
|
||||||
resultEl.textContent = typeof window.t === 'function' ? window.t('settingsBasic.testing') : '测试中...';
|
}
|
||||||
|
const testingMessage = settingsT('settingsBasic.testing', '测试中...');
|
||||||
|
aiChannelProbeResults[channelId] = { status: 'testing', message: testingMessage };
|
||||||
|
if (isTestingSameChannel()) {
|
||||||
|
setConnectionTestResult(resultEl, 'is-muted', testingMessage);
|
||||||
|
}
|
||||||
|
syncSelectedAIChannelUI();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch('/api/config/test-openai', {
|
const response = await apiFetch('/api/config/test-openai', {
|
||||||
@@ -3466,20 +3713,33 @@ async function testOpenAIConnection() {
|
|||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
resultEl.style.color = 'var(--success-color, #38a169)';
|
|
||||||
const latency = result.latency_ms ? ` (${result.latency_ms}ms)` : '';
|
const latency = result.latency_ms ? ` (${result.latency_ms}ms)` : '';
|
||||||
const modelInfo = result.model ? ` [${result.model}]` : '';
|
const modelInfo = result.model ? ` [${result.model}]` : '';
|
||||||
resultEl.textContent = (typeof window.t === 'function' ? window.t('settingsBasic.testSuccess') : '连接成功') + modelInfo + latency;
|
const message = (typeof window.t === 'function' ? window.t('settingsBasic.testSuccess') : '连接成功') + modelInfo + latency;
|
||||||
|
aiChannelProbeResults[channelId] = { status: 'ready', message };
|
||||||
|
if (isTestingSameChannel()) {
|
||||||
|
setConnectionTestResult(resultEl, 'is-success', message);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
resultEl.style.color = 'var(--danger-color, #e53e3e)';
|
const message = formatConnectionTestError(result.error || '未知错误').message;
|
||||||
resultEl.textContent = (typeof window.t === 'function' ? window.t('settingsBasic.testFailed') : '连接失败') + ': ' + (result.error || '未知错误');
|
aiChannelProbeResults[channelId] = { status: 'failed', message };
|
||||||
|
if (isTestingSameChannel()) {
|
||||||
|
showConnectionTestFailure(resultEl, message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
resultEl.style.color = 'var(--danger-color, #e53e3e)';
|
const message = formatConnectionTestError(error.message || '测试出错').message;
|
||||||
resultEl.textContent = (typeof window.t === 'function' ? window.t('settingsBasic.testError') : '测试出错') + ': ' + error.message;
|
aiChannelProbeResults[channelId] = { status: 'failed', message };
|
||||||
|
if (isTestingSameChannel()) {
|
||||||
|
showConnectionTestFailure(resultEl, message);
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
btn.style.pointerEvents = '';
|
updateAIChannelSelectOption(channelId);
|
||||||
btn.style.opacity = '';
|
syncSelectedAIChannelUI();
|
||||||
|
if (btn) {
|
||||||
|
btn.style.pointerEvents = '';
|
||||||
|
btn.style.opacity = '';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4388,3 +4648,4 @@ document.addEventListener('languagechange', function () {
|
|||||||
|
|
||||||
window.initSettingsCustomSelects = initSettingsCustomSelects;
|
window.initSettingsCustomSelects = initSettingsCustomSelects;
|
||||||
window.refreshSettingsCustomSelects = refreshSettingsCustomSelects;
|
window.refreshSettingsCustomSelects = refreshSettingsCustomSelects;
|
||||||
|
window.closeAllSettingsCustomSelects = closeAllSettingsCustomSelects;
|
||||||
|
|||||||
+132
-101
@@ -4,8 +4,8 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>CyberStrikeAI</title>
|
<title>CyberStrikeAI</title>
|
||||||
<link rel="icon" type="image/png" href="/static/logo.png">
|
<link rel="icon" type="image/x-icon" href="/static/favicon.ico?v=20260728">
|
||||||
<link rel="shortcut icon" type="image/png" href="/static/favicon.ico">
|
<link rel="shortcut icon" type="image/x-icon" href="/static/favicon.ico?v=20260728">
|
||||||
<script>
|
<script>
|
||||||
(function () {
|
(function () {
|
||||||
try {
|
try {
|
||||||
@@ -3446,115 +3446,146 @@
|
|||||||
<div class="ai-channel-manager-header">
|
<div class="ai-channel-manager-header">
|
||||||
<div>
|
<div>
|
||||||
<h4 data-i18n="settingsBasic.openaiConfig">AI 通道配置</h4>
|
<h4 data-i18n="settingsBasic.openaiConfig">AI 通道配置</h4>
|
||||||
<p id="ai-channel-save-hint" class="ai-channel-manager-hint" data-i18n="settingsBasic.aiChannelHint">已保存的通道会显示在左侧;保存后写入 ai.channels,默认通道用于新对话和未指定通道的任务。</p>
|
<p id="ai-channel-save-hint" class="ai-channel-manager-hint" data-i18n="settingsBasic.aiChannelHint">通过下拉切换已保存通道;保存后写入 ai.channels,默认通道用于新对话和未指定通道的任务。</p>
|
||||||
|
</div>
|
||||||
|
<div class="ai-channel-header-actions">
|
||||||
|
<button type="button" class="btn-secondary" onclick="createAIChannelFromForm()" data-i18n="settingsBasic.aiChannelNew">新增</button>
|
||||||
|
<button type="button" class="btn-primary ai-channel-save-btn" onclick="saveSelectedAIChannel()" data-i18n="settingsBasic.aiChannelSave">保存更改</button>
|
||||||
</div>
|
</div>
|
||||||
<button type="button" class="btn-primary ai-channel-save-btn" onclick="saveSelectedAIChannel()" data-i18n="settingsBasic.aiChannelSave">保存更改</button>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="ai-channel-manager-body">
|
<div class="ai-channel-manager-body">
|
||||||
<aside class="ai-channel-sidebar" aria-label="AI 通道列表" data-i18n="settingsBasic.aiChannelListAria" data-i18n-attr="aria-label">
|
<div class="ai-channel-switcher" aria-label="AI 通道选择" data-i18n="settingsBasic.aiChannelListAria" data-i18n-attr="aria-label">
|
||||||
<div class="ai-channel-sidebar-head">
|
<div class="ai-channel-switcher-field">
|
||||||
<span data-i18n="settingsBasic.aiChannelSavedList">已保存通道</span>
|
<label for="ai-channel-select" data-i18n="settingsBasic.aiChannelCurrent">当前通道</label>
|
||||||
<div class="ai-channel-bulk-actions">
|
<select id="ai-channel-select" class="ai-channel-switch-select" onchange="selectAIChannelForEditing(this.value)"></select>
|
||||||
<button type="button" class="ai-channel-bulk-btn" onclick="probeSelectedAIChannels()" title="检测所选或全部完整通道是否可用">批量探活</button>
|
</div>
|
||||||
<button type="button" class="ai-channel-bulk-btn danger" onclick="deleteCheckedAIChannels()" title="删除已勾选的非默认通道">删除所选</button>
|
<div class="ai-channel-switcher-actions">
|
||||||
<button type="button" class="ai-channel-icon-btn" onclick="createAIChannelFromForm()" title="新增通道" aria-label="新增通道">+</button>
|
<button type="button" class="btn-secondary" onclick="probeSelectedAIChannels()" data-i18n="settingsBasic.aiChannelBulkProbe" data-i18n-title="settingsBasic.aiChannelBulkProbeTitle" data-i18n-attr="title">批量探活</button>
|
||||||
</div>
|
<button type="button" class="btn-secondary" onclick="copyAIChannelFromForm()" data-i18n="settingsBasic.aiChannelCopy">复制</button>
|
||||||
|
<button type="button" class="btn-secondary" onclick="setSelectedAIChannelDefault()" data-i18n="settingsBasic.aiChannelSetDefault">设为默认</button>
|
||||||
|
<button type="button" class="btn-secondary danger" onclick="deleteSelectedAIChannel()" data-i18n="settingsBasic.aiChannelDelete">删除</button>
|
||||||
</div>
|
</div>
|
||||||
<select id="ai-channel-select" class="ai-channel-native-select" onchange="selectAIChannelForEditing(this.value)" aria-hidden="true" tabindex="-1"></select>
|
|
||||||
<div id="ai-channel-list" class="ai-channel-list" aria-live="polite"></div>
|
<div id="ai-channel-list" class="ai-channel-list" aria-live="polite"></div>
|
||||||
</aside>
|
</div>
|
||||||
<div class="ai-channel-editor">
|
<div class="ai-channel-editor">
|
||||||
<div class="ai-channel-editor-head">
|
<div class="ai-channel-editor-head">
|
||||||
<div>
|
<div>
|
||||||
<span class="ai-channel-editor-kicker" data-i18n="settingsBasic.aiChannelEditing">正在编辑</span>
|
<span class="ai-channel-editor-kicker" data-i18n="settingsBasic.aiChannelFormContext">编辑当前选择的通道</span>
|
||||||
<h5 id="ai-channel-editor-title">-</h5>
|
<p id="ai-channel-editor-title" class="ai-channel-editor-title">-</p>
|
||||||
<p id="ai-channel-editor-meta">-</p>
|
|
||||||
</div>
|
|
||||||
<div class="ai-channel-editor-actions">
|
|
||||||
<button type="button" class="btn-secondary" onclick="setSelectedAIChannelDefault()" data-i18n="settingsBasic.aiChannelSetDefault">设为默认</button>
|
|
||||||
<button type="button" class="btn-secondary" onclick="copyAIChannelFromForm()" data-i18n="settingsBasic.aiChannelCopy">复制</button>
|
|
||||||
<button type="button" class="btn-secondary danger" onclick="deleteSelectedAIChannel()" data-i18n="settingsBasic.aiChannelDelete">删除</button>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div id="ai-channel-editor-meta" class="ai-channel-editor-meta" aria-live="polite"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="settings-form ai-channel-editor-form">
|
<div class="settings-form ai-channel-editor-form">
|
||||||
<div class="form-group">
|
<section class="ai-channel-form-section">
|
||||||
<label for="ai-channel-name" data-i18n="settingsBasic.aiChannelName">通道名称</label>
|
<div class="ai-channel-form-section-head">
|
||||||
<input type="text" id="ai-channel-name" placeholder="Qwen Max" maxlength="24" />
|
<div>
|
||||||
</div>
|
<h6 data-i18n="settingsBasic.aiChannelConnectionSection">连接信息</h6>
|
||||||
<div class="form-group">
|
<p data-i18n="settingsBasic.aiChannelConnectionHint">先确认服务商、地址、密钥和模型,测试连接会使用这些信息。</p>
|
||||||
<label for="openai-provider" data-i18n="settingsBasic.apiProvider">API 提供商</label>
|
</div>
|
||||||
<select id="openai-provider" style="width: 100%; padding: 0.5rem 0.75rem; border: 1px solid var(--border-color, #e2e8f0); border-radius: 6px; background: var(--card-bg, #fff); color: var(--text-color, #2d3748); font-size: 0.875rem;">
|
<div class="ai-channel-section-actions">
|
||||||
<option value="openai_compatible" data-i18n="settingsBasic.providerOpenAI">OpenAI / 兼容 OpenAI 协议</option>
|
<button type="button" id="test-openai-btn" class="btn-secondary" onclick="testOpenAIConnection()" data-i18n="settingsBasic.testConnection">测试连接</button>
|
||||||
<option value="claude" data-i18n="settingsBasic.providerClaude">Claude (Anthropic Messages API)</option>
|
<span id="test-openai-result" class="form-inline-result connection-test-result"></span>
|
||||||
</select>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="ai-channel-form-grid">
|
||||||
<label for="openai-base-url">Base URL <span style="color: red;">*</span></label>
|
<div class="form-group">
|
||||||
<input type="text" id="openai-base-url" data-i18n="settingsBasic.openaiBaseUrlPlaceholder" data-i18n-attr="placeholder" placeholder="https://api.openai.com/v1" required />
|
<label for="ai-channel-name" data-i18n="settingsBasic.aiChannelName">通道名称</label>
|
||||||
</div>
|
<input type="text" id="ai-channel-name" placeholder="Qwen Max" maxlength="24" />
|
||||||
<div class="form-group">
|
</div>
|
||||||
<label for="openai-api-key">API Key <span style="color: red;">*</span></label>
|
<div class="form-group">
|
||||||
<input type="password" id="openai-api-key" data-i18n="settingsBasic.openaiApiKeyPlaceholder" data-i18n-attr="placeholder" placeholder="输入OpenAI API Key" required />
|
<label for="openai-provider" data-i18n="settingsBasic.apiProvider">API 提供商</label>
|
||||||
</div>
|
<select id="openai-provider">
|
||||||
<div class="form-group">
|
<option value="openai_compatible" data-i18n="settingsBasic.providerOpenAI">OpenAI / 兼容 OpenAI 协议</option>
|
||||||
<label for="openai-model"><span data-i18n="settingsBasic.model">模型</span> <span style="color: red;">*</span></label>
|
<option value="claude" data-i18n="settingsBasic.providerClaude">Claude (Anthropic Messages API)</option>
|
||||||
<div class="model-pick-row">
|
</select>
|
||||||
<input type="text" id="openai-model" class="model-pick-input" data-i18n="settingsBasic.modelPlaceholder" data-i18n-attr="placeholder" placeholder="gpt-4" required />
|
</div>
|
||||||
<select id="openai-model-select" class="model-pick-native" style="display: none;" title="" aria-hidden="true" tabindex="-1">
|
<div class="form-group span-2">
|
||||||
<option value="" disabled data-i18n="settingsBasic.modelsListSelectPlaceholder">请选择模型</option>
|
<label for="openai-base-url">Base URL <span class="required-mark">*</span></label>
|
||||||
</select>
|
<input type="text" id="openai-base-url" data-i18n="settingsBasic.openaiBaseUrlPlaceholder" data-i18n-attr="placeholder" placeholder="https://api.openai.com/v1" required />
|
||||||
<a href="javascript:void(0)" id="fetch-openai-models-btn" class="model-pick-fetch-link" onclick="fetchModelList('openai')" data-i18n="settingsBasic.fetchModels">获取列表</a>
|
</div>
|
||||||
</div>
|
<div class="form-group span-2">
|
||||||
<small id="fetch-openai-models-hint" class="form-hint" style="display: none; font-size: 0.75rem; margin-top: 4px;"></small>
|
<label for="openai-api-key">API Key <span class="required-mark">*</span></label>
|
||||||
<span id="fetch-openai-models-result" style="font-size: 0.75rem; margin-top: 2px; display: block;"></span>
|
<input type="password" id="openai-api-key" data-i18n="settingsBasic.openaiApiKeyPlaceholder" data-i18n-attr="placeholder" placeholder="输入OpenAI API Key" required />
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group span-2">
|
||||||
<label for="openai-max-total-tokens"><span data-i18n="settingsBasic.maxTotalTokens">最大上下文 Token 数</span></label>
|
<label for="openai-model"><span data-i18n="settingsBasic.model">模型</span> <span class="required-mark">*</span></label>
|
||||||
<input type="number" id="openai-max-total-tokens" data-i18n="settingsBasic.maxTotalTokensPlaceholder" data-i18n-attr="placeholder" placeholder="120000" min="1000" step="1000" />
|
<div class="model-pick-row">
|
||||||
<small style="color: var(--text-muted, #718096); font-size: 0.75rem;" data-i18n="settingsBasic.maxTotalTokensHint">内存压缩和攻击链构建共用此配置,默认 120000</small>
|
<input type="text" id="openai-model" class="model-pick-input" data-i18n="settingsBasic.modelPlaceholder" data-i18n-attr="placeholder" placeholder="gpt-4" required />
|
||||||
</div>
|
<select id="openai-model-select" class="model-pick-native" style="display: none;" title="" aria-hidden="true" tabindex="-1">
|
||||||
<div class="form-group">
|
<option value="" disabled data-i18n="settingsBasic.modelsListSelectPlaceholder">请选择模型</option>
|
||||||
<label for="openai-max-completion-tokens"><span data-i18n="settingsBasic.maxCompletionTokens">最大输出 Token 数</span></label>
|
</select>
|
||||||
<input type="number" id="openai-max-completion-tokens" data-i18n="settingsBasic.maxCompletionTokensPlaceholder" data-i18n-attr="placeholder" placeholder="16384" min="1" step="256" />
|
<a href="javascript:void(0)" id="fetch-openai-models-btn" class="model-pick-fetch-link" onclick="fetchModelList('openai')" data-i18n="settingsBasic.fetchModels">获取列表</a>
|
||||||
<small style="color: var(--text-muted, #718096); font-size: 0.75rem;" data-i18n="settingsBasic.maxCompletionTokensHint">单次模型回复的输出上限,默认 16384</small>
|
</div>
|
||||||
</div>
|
<small id="fetch-openai-models-hint" class="form-hint" style="display: none;"></small>
|
||||||
<div class="form-group">
|
<span id="fetch-openai-models-result" class="form-inline-result"></span>
|
||||||
<label data-i18n="settingsBasic.openaiReasoningTitle">推理设置</label>
|
</div>
|
||||||
<small class="form-hint" data-i18n="settingsBasic.openaiReasoningHint">作为该 AI 通道的默认推理设置;对话页「会话设置」可覆盖。</small>
|
</div>
|
||||||
<div style="display: flex; flex-wrap: wrap; gap: 10px; margin-top: 8px; align-items: center;">
|
</section>
|
||||||
<label for="openai-reasoning-mode" style="font-size: 0.8125rem;" data-i18n="chat.reasoningModeLabel">模式</label>
|
|
||||||
<select id="openai-reasoning-mode" style="min-width: 140px; padding: 0.35rem 0.5rem; border-radius: 6px; border: 1px solid var(--border-color, #e2e8f0);">
|
<section class="ai-channel-form-section">
|
||||||
<option value="auto" data-i18n="chat.reasoningModeAuto">自动</option>
|
<div class="ai-channel-form-section-head">
|
||||||
<option value="on" data-i18n="chat.reasoningModeOn">开启</option>
|
<div>
|
||||||
<option value="off" data-i18n="chat.reasoningModeOff">关闭</option>
|
<h6 data-i18n="settingsBasic.aiChannelLimitsSection">额度设置</h6>
|
||||||
</select>
|
<p data-i18n="settingsBasic.aiChannelLimitsHint">Token 上限控制上下文窗口和单次输出。</p>
|
||||||
<label for="openai-reasoning-effort" style="font-size: 0.8125rem;" data-i18n="chat.reasoningEffortLabel">强度</label>
|
</div>
|
||||||
<select id="openai-reasoning-effort" style="min-width: 140px; padding: 0.35rem 0.5rem; border-radius: 6px; border: 1px solid var(--border-color, #e2e8f0);">
|
</div>
|
||||||
<option value="" data-i18n="chat.reasoningEffortUnset">不指定</option>
|
<div class="ai-channel-form-grid">
|
||||||
<option value="low">low</option>
|
<div class="form-group">
|
||||||
<option value="medium">medium</option>
|
<label for="openai-max-total-tokens"><span data-i18n="settingsBasic.maxTotalTokens">最大上下文 Token 数</span></label>
|
||||||
<option value="high">high</option>
|
<input type="number" id="openai-max-total-tokens" data-i18n="settingsBasic.maxTotalTokensPlaceholder" data-i18n-attr="placeholder" placeholder="120000" min="1000" step="1000" />
|
||||||
<option value="xhigh">xhigh</option>
|
<small class="form-hint" data-i18n="settingsBasic.maxTotalTokensHint">内存压缩和攻击链构建共用此配置,默认 120000</small>
|
||||||
<option value="max">max</option>
|
</div>
|
||||||
</select>
|
<div class="form-group">
|
||||||
<label for="openai-reasoning-profile" style="font-size: 0.8125rem;" data-i18n="settingsBasic.openaiReasoningProfile">线路</label>
|
<label for="openai-max-completion-tokens"><span data-i18n="settingsBasic.maxCompletionTokens">最大输出 Token 数</span></label>
|
||||||
<select id="openai-reasoning-profile" style="min-width: 220px; padding: 0.35rem 0.5rem; border-radius: 6px; border: 1px solid var(--border-color, #e2e8f0);">
|
<input type="number" id="openai-max-completion-tokens" data-i18n="settingsBasic.maxCompletionTokensPlaceholder" data-i18n-attr="placeholder" placeholder="16384" min="1" step="256" />
|
||||||
<option value="auto">auto</option>
|
<small class="form-hint" data-i18n="settingsBasic.maxCompletionTokensHint">单次模型回复的输出上限,默认 16384</small>
|
||||||
<option value="deepseek_compat">deepseek_compat</option>
|
</div>
|
||||||
<option value="openai_compat">openai_compat</option>
|
</div>
|
||||||
<option value="output_config_effort">output_config_effort</option>
|
</section>
|
||||||
</select>
|
|
||||||
</div>
|
<details class="ai-channel-form-section ai-channel-advanced-section">
|
||||||
<label class="checkbox-label" style="margin-top: 8px;">
|
<summary>
|
||||||
<input type="checkbox" id="openai-reasoning-allow-client" class="modern-checkbox" checked />
|
<span>
|
||||||
<span class="checkbox-custom"></span>
|
<strong data-i18n="settingsBasic.openaiReasoningTitle">推理设置</strong>
|
||||||
<span class="checkbox-text" data-i18n="settingsBasic.openaiReasoningAllowClient">允许对话页覆盖推理选项</span>
|
<small data-i18n="settingsBasic.openaiReasoningHint">作为该 AI 通道的默认推理设置;对话页「会话设置」可覆盖。</small>
|
||||||
</label>
|
</span>
|
||||||
</div>
|
</summary>
|
||||||
<div style="display: flex; align-items: center; gap: 8px; margin-top: 2px;">
|
<div class="ai-channel-reasoning-grid">
|
||||||
<a href="javascript:void(0)" id="test-openai-btn" onclick="testOpenAIConnection()" style="font-size: 0.8125rem; color: var(--accent-color, #3182ce); text-decoration: none; cursor: pointer; user-select: none;" data-i18n="settingsBasic.testConnection">测试连接</a>
|
<div class="form-group">
|
||||||
<span id="test-openai-result" style="font-size: 0.8125rem;"></span>
|
<label for="openai-reasoning-mode" data-i18n="chat.reasoningModeLabel">模式</label>
|
||||||
</div>
|
<select id="openai-reasoning-mode">
|
||||||
|
<option value="auto" data-i18n="chat.reasoningModeAuto">自动</option>
|
||||||
|
<option value="on" data-i18n="chat.reasoningModeOn">开启</option>
|
||||||
|
<option value="off" data-i18n="chat.reasoningModeOff">关闭</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="openai-reasoning-effort" data-i18n="chat.reasoningEffortLabel">强度</label>
|
||||||
|
<select id="openai-reasoning-effort">
|
||||||
|
<option value="" data-i18n="chat.reasoningEffortUnset">不指定</option>
|
||||||
|
<option value="low">low</option>
|
||||||
|
<option value="medium">medium</option>
|
||||||
|
<option value="high">high</option>
|
||||||
|
<option value="xhigh">xhigh</option>
|
||||||
|
<option value="max">max</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="openai-reasoning-profile" data-i18n="settingsBasic.openaiReasoningProfile">线路</label>
|
||||||
|
<select id="openai-reasoning-profile">
|
||||||
|
<option value="auto">auto</option>
|
||||||
|
<option value="deepseek_compat">deepseek_compat</option>
|
||||||
|
<option value="openai_compat">openai_compat</option>
|
||||||
|
<option value="output_config_effort">output_config_effort</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label class="checkbox-label ai-channel-reasoning-toggle">
|
||||||
|
<input type="checkbox" id="openai-reasoning-allow-client" class="modern-checkbox" checked />
|
||||||
|
<span class="checkbox-custom"></span>
|
||||||
|
<span class="checkbox-text" data-i18n="settingsBasic.openaiReasoningAllowClient">允许对话页覆盖推理选项</span>
|
||||||
|
</label>
|
||||||
|
</details>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -6645,7 +6676,7 @@
|
|||||||
<script src="/static/js/dashboard.js"></script>
|
<script src="/static/js/dashboard.js"></script>
|
||||||
<script src="/static/js/chat-scroll.js"></script>
|
<script src="/static/js/chat-scroll.js"></script>
|
||||||
<script src="/static/js/monitor.js?v=20260723-1"></script>
|
<script src="/static/js/monitor.js?v=20260723-1"></script>
|
||||||
<script src="/static/js/chat.js?v=20260723-1"></script>
|
<script src="/static/js/chat.js?v=20260724-1"></script>
|
||||||
<script src="/static/js/hitl.js"></script>
|
<script src="/static/js/hitl.js"></script>
|
||||||
<script src="/static/js/settings.js?v=20260717-1"></script>
|
<script src="/static/js/settings.js?v=20260717-1"></script>
|
||||||
<script src="/static/js/audit-datetime-picker.js"></script>
|
<script src="/static/js/audit-datetime-picker.js"></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user