feat(voice): 提升桌面端语音交互与本地任务执行支持
This commit is contained in:
Blizzard
@@ -0,0 +1,244 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/coder/websocket"
|
||||
)
|
||||
|
||||
// 本地执行 runner（JARVIS「本地的手」，LOCAL_AGENT_DESIGN 档 A / JARVIS_BRAIN_DESIGN P4）：
|
||||
// 桌面端 Go host 连 gateway 的 /api/v1/local/runner WS，把自己注册成本用户的本地执行器；
|
||||
// 服务端把 local_* 工具调用转发过来，这里在**用户自选工作目录的沙箱内**执行并回结果。
|
||||
//
|
||||
// 安全铁律（P1 只读起步）：
|
||||
// - 只实现 list_dir / read_file，无写无 exec；
|
||||
// - 一切路径锁死在用户显式选择的 workdir 根下（清洗 + 软链解析后前缀校验，越界即拒）；
|
||||
// - 用户不点"开启"，runner 永不连接——本地访问是显式授权，不是默认能力。
|
||||
|
||||
type runnerReq struct {
|
||||
ID string `json:"id"`
|
||||
Tool string `json:"tool"`
|
||||
Args map[string]any `json:"args,omitempty"`
|
||||
}
|
||||
|
||||
type runnerResp struct {
|
||||
ID string `json:"id"`
|
||||
OK bool `json:"ok"`
|
||||
Content string `json:"content,omitempty"`
|
||||
Error string `json:"error,omitempty"`
|
||||
Workdir string `json:"workdir,omitempty"`
|
||||
}
|
||||
|
||||
// LocalRunner 管一条 runner 连接的生命周期（App 持有单例）。
|
||||
type LocalRunner struct {
|
||||
mu sync.Mutex
|
||||
cancel context.CancelFunc
|
||||
workdir string
|
||||
status string // offline / connecting / online
|
||||
}
|
||||
|
||||
// StartLocalRunner 开启本地文件访问：以 workdir 为沙箱根连接 gateway 注册执行器。
|
||||
// 幂等：重复调用先停旧连接。断线自动重连（5s 退避）直到 StopLocalRunner。
|
||||
func (a *App) StartLocalRunner(gatewayURL, token, workdir string) error {
|
||||
abs, err := filepath.Abs(strings.TrimSpace(workdir))
|
||||
if err != nil {
|
||||
return fmt.Errorf("工作目录无效: %w", err)
|
||||
}
|
||||
if fi, err := os.Stat(abs); err != nil || !fi.IsDir() {
|
||||
return fmt.Errorf("工作目录不存在或不是目录: %s", abs)
|
||||
}
|
||||
a.runner.stop()
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
a.runner.mu.Lock()
|
||||
a.runner.cancel = cancel
|
||||
a.runner.workdir = abs
|
||||
a.runner.status = "connecting"
|
||||
a.runner.mu.Unlock()
|
||||
|
||||
wsURL := strings.Replace(strings.TrimRight(gatewayURL, "/"), "http", "ws", 1) +
|
||||
"/api/v1/local/runner?token=" + token
|
||||
go a.runner.loop(ctx, wsURL, abs)
|
||||
return nil
|
||||
}
|
||||
|
||||
// StopLocalRunner 关闭本地文件访问（幂等）。
|
||||
func (a *App) StopLocalRunner() { a.runner.stop() }
|
||||
|
||||
// LocalRunnerStatus 返回 "offline" / "connecting" / "online:<workdir>"（前端状态显示）。
|
||||
func (a *App) LocalRunnerStatus() string {
|
||||
a.runner.mu.Lock()
|
||||
defer a.runner.mu.Unlock()
|
||||
if a.runner.status == "online" {
|
||||
return "online:" + a.runner.workdir
|
||||
}
|
||||
return a.runner.status
|
||||
}
|
||||
|
||||
func (r *LocalRunner) stop() {
|
||||
r.mu.Lock()
|
||||
if r.cancel != nil {
|
||||
r.cancel()
|
||||
r.cancel = nil
|
||||
}
|
||||
r.status = "offline"
|
||||
r.mu.Unlock()
|
||||
}
|
||||
|
||||
func (r *LocalRunner) setStatus(s string) {
|
||||
r.mu.Lock()
|
||||
r.status = s
|
||||
r.mu.Unlock()
|
||||
}
|
||||
|
||||
// loop 连接→服务→断线重连（5s 退避），直到 ctx 取消。
|
||||
func (r *LocalRunner) loop(ctx context.Context, wsURL, root string) {
|
||||
for {
|
||||
if err := r.serve(ctx, wsURL, root); err != nil && ctx.Err() == nil {
|
||||
r.setStatus("connecting")
|
||||
}
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
r.setStatus("offline")
|
||||
return
|
||||
case <-time.After(5 * time.Second):
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// serve 一条连接的会话：发 hello → 循环收请求、沙箱内执行、回结果。
|
||||
func (r *LocalRunner) serve(ctx context.Context, wsURL, root string) error {
|
||||
dctx, dcancel := context.WithTimeout(ctx, 10*time.Second)
|
||||
conn, _, err := websocket.Dial(dctx, wsURL, nil)
|
||||
dcancel()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer conn.Close(websocket.StatusNormalClosure, "bye")
|
||||
conn.SetReadLimit(1 << 20)
|
||||
r.setStatus("online")
|
||||
|
||||
hello, _ := json.Marshal(runnerResp{ID: "hello", OK: true, Workdir: root})
|
||||
if err := conn.Write(ctx, websocket.MessageText, hello); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for {
|
||||
_, data, err := conn.Read(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var req runnerReq
|
||||
if json.Unmarshal(data, &req) != nil {
|
||||
continue
|
||||
}
|
||||
resp := execLocal(root, &req)
|
||||
out, _ := json.Marshal(resp)
|
||||
if err := conn.Write(ctx, websocket.MessageText, out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---- 沙箱执行（只读）----
|
||||
|
||||
const (
|
||||
maxReadBytes = 64 * 1024 // read_file 上限：64KB，超出截断（语音/对话场景足够）
|
||||
maxDirEntries = 200 // list_dir 上限条数
|
||||
)
|
||||
|
||||
// resolveInRoot 把相对路径解析进沙箱根：清洗 + 软链解析后必须仍在 root 下，越界即错。
|
||||
func resolveInRoot(root, rel string) (string, error) {
|
||||
p := filepath.Join(root, filepath.Clean("/"+rel)) // 前置 "/" 再 Clean：吃掉 ../ 逃逸
|
||||
// 软链解析（目标可能不存在：解析其父目录）
|
||||
resolved, err := filepath.EvalSymlinks(p)
|
||||
if err != nil {
|
||||
if !os.IsNotExist(err) {
|
||||
return "", err
|
||||
}
|
||||
resolved = p
|
||||
}
|
||||
rootR, err := filepath.EvalSymlinks(root)
|
||||
if err != nil {
|
||||
rootR = root
|
||||
}
|
||||
if resolved != rootR && !strings.HasPrefix(resolved, rootR+string(filepath.Separator)) {
|
||||
return "", fmt.Errorf("路径越出工作目录沙箱")
|
||||
}
|
||||
return resolved, nil
|
||||
}
|
||||
|
||||
func execLocal(root string, req *runnerReq) *runnerResp {
|
||||
fail := func(msg string) *runnerResp { return &runnerResp{ID: req.ID, OK: false, Error: msg} }
|
||||
rel, _ := req.Args["path"].(string)
|
||||
|
||||
switch req.Tool {
|
||||
case "local_list_dir":
|
||||
p, err := resolveInRoot(root, rel)
|
||||
if err != nil {
|
||||
return fail(err.Error())
|
||||
}
|
||||
ents, err := os.ReadDir(p)
|
||||
if err != nil {
|
||||
return fail("读目录失败: " + err.Error())
|
||||
}
|
||||
sort.Slice(ents, func(i, j int) bool { return ents[i].Name() < ents[j].Name() })
|
||||
type item struct {
|
||||
Name string `json:"name"`
|
||||
Dir bool `json:"dir"`
|
||||
Size int64 `json:"size,omitempty"`
|
||||
}
|
||||
out := make([]item, 0, len(ents))
|
||||
for i, e := range ents {
|
||||
if i >= maxDirEntries {
|
||||
break
|
||||
}
|
||||
it := item{Name: e.Name(), Dir: e.IsDir()}
|
||||
if fi, err := e.Info(); err == nil && !e.IsDir() {
|
||||
it.Size = fi.Size()
|
||||
}
|
||||
out = append(out, it)
|
||||
}
|
||||
data, _ := json.Marshal(map[string]any{"dir": rel, "entries": out, "truncated": len(ents) > maxDirEntries})
|
||||
return &runnerResp{ID: req.ID, OK: true, Content: string(data)}
|
||||
|
||||
case "local_read_file":
|
||||
if strings.TrimSpace(rel) == "" {
|
||||
return fail("缺少文件路径")
|
||||
}
|
||||
p, err := resolveInRoot(root, rel)
|
||||
if err != nil {
|
||||
return fail(err.Error())
|
||||
}
|
||||
fi, err := os.Stat(p)
|
||||
if err != nil {
|
||||
return fail("文件不存在: " + rel)
|
||||
}
|
||||
if fi.IsDir() {
|
||||
return fail("这是目录不是文件: " + rel)
|
||||
}
|
||||
f, err := os.Open(p)
|
||||
if err != nil {
|
||||
return fail("打开失败: " + err.Error())
|
||||
}
|
||||
defer f.Close()
|
||||
buf := make([]byte, maxReadBytes+1)
|
||||
n, _ := f.Read(buf)
|
||||
content := string(buf[:min(n, maxReadBytes)])
|
||||
if n > maxReadBytes {
|
||||
content += "\n…（文件过大，已截断到 64KB）"
|
||||
}
|
||||
return &runnerResp{ID: req.ID, OK: true, Content: content}
|
||||
|
||||
default:
|
||||
return fail("本地执行器不支持该操作: " + req.Tool + "（只读版仅 list_dir/read_file）")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user