feat(question): DSH ask_user_question 桥接 + 前端问答面板 + 待办字段全路径透出
问题（P0）：DSH 有两个独立的人机交互 seam —— approval/request（危险工具审批） 与 ask_user_question → ctx.userQuestions（模型主动提问）。原来只桥接了前者。 邮件驱动的会话没有本地 UI，而 ask() 的 provider 是 DSH host 注册的本地 UI 实现， 于是在那里等人点选永久等不到，那一轮工具调用**静默挂死**。 修法（不抢注全局 provider —— registerProvider 只允许一个活动实例，抢注会让 平台自己的界面失效）：在 tools/execute around-dispatch 里只对**邮件驱动**的 会话接管 ask_user_question，其余原样 next()。失败一律当场报错而不是 next()： 下一个 answerer 是本地 UI，邮件会话没有兜底 UI，放过去就是挂死。 - lib/user-question.js（三桥逐字节同源，14 例测试）：DSH questions[] ↔ AgentMail 单问题询问邮件的双向映射。多问题时把选项并集摊平、按 label 归属分配回各问题 （label 认不出来就不猜测放行）；无选项题走自由文本 custom。 - Gateway：kind=question 且无选项时**不再**回落「同意/拒绝」（那会让自由文本 问题变成两个毫无意义的按钮）；主题按类型区分「权限请求 / 需要回答」； 推送 payload 带上 permission_kind / multi_select / options。 - mails.permission_kind / permission_multi_select 此前只存在于结构体与写入路径， 五个读路径的 SELECT/Scan 都没带 —— 前端永远拿到空串，把提问渲染成批准/拒绝。 container 修正五处并加 repo 测试（含反向验证：删掉任一处字段，测试即失败）。 - 前端 PermissionPanel：question 走「勾选 + 自由文本」，多选/单选、空回答禁止提交； approval 路径不变（回归测试覆盖）。 测试：opencode 316 / dsh 349 / pi 405 / 前端 185 / Go 全量 全绿。
This commit is contained in:
@ -69,7 +69,13 @@ func RequestPermission(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
options := req.Options
|
||||
if len(options) == 0 {
|
||||
if len(options) == 0 && kind != "question" {
|
||||
// 审批型询问必须给两个可点选项，否则人在界面上无以为答。
|
||||
//
|
||||
// 主动询问（question）不同：它可能根本没有预设选项 ——
|
||||
// 那是「请把你的名字告诉我」「请把报错贴给我」这类自由文本问题。
|
||||
// 给它们塞「同意/拒绝」会让人只能选一个毫无意义的答案，
|
||||
// 而模型拿到的 selected 里也会是这种噪音。
|
||||
options = []string{"同意", "拒绝"}
|
||||
}
|
||||
|
||||
@ -107,7 +113,7 @@ func RequestPermission(w http.ResponseWriter, r *http.Request) {
|
||||
repo.TouchSession(r.Context(), sessionID)
|
||||
} else {
|
||||
// workspace 空串：权限询问不经三维寻址，没有 path 位可归属。
|
||||
id, err := repo.CreateSession(r.Context(), nil, agentName, "权限请求: "+req.Question, "")
|
||||
id, err := repo.CreateSession(r.Context(), nil, agentName, mailSubjectFor(kind, req.Question), "")
|
||||
if err != nil {
|
||||
Error(w, http.StatusInternalServerError, "Failed to create session")
|
||||
return
|
||||
@ -239,10 +245,16 @@ func RequestPermission(w http.ResponseWriter, r *http.Request) {
|
||||
"mail_id": mailID.String(),
|
||||
"session_id": sessionID.String(),
|
||||
"from_name": agentName,
|
||||
"subject": "权限请求: " + req.Question,
|
||||
"subject": mailSubjectFor(kind, req.Question),
|
||||
"mail_type": "permission_request",
|
||||
"role": "to",
|
||||
"session_alias": alias,
|
||||
// 待办类型与多选语义必须随推送下发：前端靠它们决定渲染
|
||||
// 「批准/拒绝」还是「回答问题」（勾选 + 自由文本）。
|
||||
// 不下发的话前端只能重查一次，而授权页是靠这条推送实时更新的。
|
||||
"permission_kind": kind,
|
||||
"permission_multi_select": req.MultiSelect,
|
||||
"permission_options": options,
|
||||
})
|
||||
|
||||
JSON(w, http.StatusOK, map[string]string{
|
||||
@ -253,6 +265,18 @@ func RequestPermission(w http.ResponseWriter, r *http.Request) {
|
||||
})
|
||||
}
|
||||
|
||||
// mailSubjectFor 给待办邮件起主题。
|
||||
//
|
||||
// 审批型与主动询问是两类不同的待办，主题必须一眼能区分：「权限请求」意味着
|
||||
// 有人要被放行一个危险操作，「需要回答」只是模型缺信息。混用一套措辞会让人
|
||||
// 在授权页里把「回答问题」当成「批准执行」。
|
||||
func mailSubjectFor(kind, question string) string {
|
||||
if kind == "question" {
|
||||
return "需要回答: " + question
|
||||
}
|
||||
return "权限请求: " + question
|
||||
}
|
||||
|
||||
// POST /api/v1/permission/decide —— 需登录；只有该权限请求的收件人或管理员可决策
|
||||
func DecidePermission(w http.ResponseWriter, r *http.Request) {
|
||||
user := middleware.GetUser(r)
|
||||
|
||||
191
server/internal/repo/permission_visibility_test.go
Normal file
191
server/internal/repo/permission_visibility_test.go
Normal file
@ -0,0 +1,191 @@
|
||||
package repo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"testing"
|
||||
|
||||
"github.com/agentmail/gateway/internal/models"
|
||||
)
|
||||
|
||||
// 待办类型（permission / question）与多选语义必须在**每一条读路径**上透出。
|
||||
//
|
||||
// # 为什么值得单独钉一个测试
|
||||
//
|
||||
// 这几个字段（mails.permission_kind / permission_multi_select）曾经只存在于
|
||||
// 结构体与写入路径：模型里有字段、INSERT 里有列，但五个读路径的 SELECT/Scan
|
||||
// 都没带上它们。
|
||||
//
|
||||
// 这类遗漏不会报错 —— SQL 照常返回，只是那个字段永远为零值。前端于是拿到
|
||||
// permission_kind="" 与 permission_multi_select=false，把「模型问了一个问题」
|
||||
// 渲染成「批准 / 拒绝」两个按钮，人点出来的答案对模型毫无意义。
|
||||
//
|
||||
// 所以判据必须落在「五个不同的读函数都看得见」上，而不是只看写入那一侧。
|
||||
func TestPermissionFieldsVisibleOnEveryReadPath(t *testing.T) {
|
||||
setupTestDB(t)
|
||||
ctx := context.Background()
|
||||
|
||||
sid, err := CreateSession(ctx, nil, "agent-q", "问与答", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// 一个自由文本问题：无预设选项、不允许多选。
|
||||
mailID, err := CreatePermissionMail(ctx, sid, "agent-q", "alice",
|
||||
"配置文件名是什么", "请直接回答", nil, "question", false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := CreatePermissionRequest(ctx, mailID, sid, "agent-q",
|
||||
"配置文件名是什么", nil, "请直接回答", "question", false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// 一个多选问题：单独造一封，验证 multi_select 也能透出。
|
||||
multiID, err := CreatePermissionMail(ctx, sid, "agent-q", "alice",
|
||||
"要哪些环境", "勾选", []string{"dev", "prod"}, "question", true)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := CreatePermissionRequest(ctx, multiID, sid, "agent-q",
|
||||
"要哪些环境", []string{"dev", "prod"}, "勾选", "question", true); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// 一封普通审批：kind 必须是 permission，multi 必须是 false。
|
||||
approvalID, err := CreatePermissionMail(ctx, sid, "agent-q", "alice",
|
||||
"删除 build/", "rm -rf build/", []string{"同意", "拒绝"}, "permission", false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assertQuestion := func(what string, m *models.Mail) {
|
||||
t.Helper()
|
||||
if m == nil {
|
||||
t.Fatalf("%s 返回 nil", what)
|
||||
}
|
||||
if m.PermissionKind != "question" {
|
||||
t.Errorf("%s：PermissionKind = %q，期望 question"+
|
||||
"（字段没进 SELECT/Scan 时会静默变成空串，前端就会渲染成批准/拒绝）",
|
||||
what, m.PermissionKind)
|
||||
}
|
||||
}
|
||||
|
||||
// 1) GetMailByID —— 单封详情（前端点开邮件走这条）。
|
||||
got, err := GetMailByID(ctx, mailID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertQuestion("GetMailByID", got)
|
||||
|
||||
// 2) ListInbox —— 授权页的列表来源。
|
||||
inbox, err := ListInbox(ctx, "alice", "all", 50)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var found *models.Mail
|
||||
for i := range inbox {
|
||||
if inbox[i].ID == mailID {
|
||||
found = &inbox[i]
|
||||
}
|
||||
}
|
||||
if found == nil {
|
||||
t.Fatal("ListInbox 没返回那封询问邮件")
|
||||
}
|
||||
assertQuestion("ListInbox", found)
|
||||
|
||||
// 3) GetSessionMails —— 会话视图整树。
|
||||
thread, err := GetSessionMails(ctx, sid)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var inThread *models.Mail
|
||||
for i := range thread {
|
||||
if thread[i].ID == mailID {
|
||||
inThread = &thread[i]
|
||||
}
|
||||
}
|
||||
if inThread == nil {
|
||||
t.Fatal("GetSessionMails 没返回那封询问邮件")
|
||||
}
|
||||
assertQuestion("GetSessionMails", inThread)
|
||||
|
||||
// 4) GetSessionMailByID —— 会话内单封。
|
||||
one, err := GetSessionMailByID(ctx, sid, mailID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertQuestion("GetSessionMailByID", one)
|
||||
|
||||
// 5) ListSentBy —— 发件箱（Agent 自查「我问过什么」）。
|
||||
sent, err := ListSentBy(ctx, "agent-q", 50)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var inSent *models.Mail
|
||||
for i := range sent {
|
||||
if sent[i].ID == mailID {
|
||||
inSent = &sent[i]
|
||||
}
|
||||
}
|
||||
if inSent == nil {
|
||||
t.Fatal("ListSentBy 没返回那封询问邮件")
|
||||
}
|
||||
assertQuestion("ListSentBy", inSent)
|
||||
|
||||
// multi_select 也要透出：勾选语义决定前端渲染单选还是多选。
|
||||
multi, err := GetMailByID(ctx, multiID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !multi.PermissionMulti {
|
||||
t.Error("多选问题：PermissionMulti = false，期望 true（字段漏读会让多选退化成单选）")
|
||||
}
|
||||
|
||||
// 审批型不能被误标成 question。
|
||||
approval, err := GetMailByID(ctx, approvalID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if approval.PermissionKind != "permission" {
|
||||
t.Errorf("审批邮件：PermissionKind = %q，期望 permission", approval.PermissionKind)
|
||||
}
|
||||
if approval.PermissionMulti {
|
||||
t.Error("审批邮件不该带多选语义")
|
||||
}
|
||||
}
|
||||
|
||||
// 无选项的 question 不能被塞上「同意 / 拒绝」默认选项。
|
||||
//
|
||||
// 那是 handler 层的默认值逻辑：审批型没有选项时确实该给两个按钮，
|
||||
// 但自由文本问题给它们只会让人点出一个毫无意义的答案。
|
||||
// 这里从 repo 侧确认「传什么就存什么」，handler 的默认值规则另有测试。
|
||||
func TestQuestionKeepsEmptyOptions(t *testing.T) {
|
||||
setupTestDB(t)
|
||||
ctx := context.Background()
|
||||
|
||||
sid, err := CreateSession(ctx, nil, "agent-q2", "自由文本", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
mailID, err := CreatePermissionMail(ctx, sid, "agent-q2", "alice",
|
||||
"你的名字", "请回答", nil, "question", false)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// GetPermissionByMailID 读的是 permission_requests 表（不是 mails），
|
||||
// 所以必须把那一行也插上 —— 否则拿到的是「没有这条请求」。
|
||||
if err := CreatePermissionRequest(ctx, mailID, sid, "agent-q2",
|
||||
"你的名字", nil, "请回答", "question", false); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
pr, err := GetPermissionByMailID(ctx, mailID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if pr.Kind != "question" {
|
||||
t.Errorf("Kind = %q，期望 question", pr.Kind)
|
||||
}
|
||||
if len(pr.Options) != 0 {
|
||||
t.Errorf("无选项问题被写入了选项 %v，期望空", pr.Options)
|
||||
}
|
||||
}
|
||||
@ -343,10 +343,16 @@ func CreatePermissionMail(ctx context.Context, sessionID uuid.UUID, fromName, to
|
||||
multiSelectInt = 1
|
||||
}
|
||||
var id uuid.UUID
|
||||
// 主题按待办类型区分：「权限请求」意味着有人要放行一个危险操作，
|
||||
// 「需要回答」只是模型缺信息。授权页与收件箱都靠这一行措辞判断该做什么。
|
||||
subject := "权限请求: " + question
|
||||
if kind == "question" {
|
||||
subject = "需要回答: " + question
|
||||
}
|
||||
err := db.DB.QueryRowContext(ctx,
|
||||
`INSERT INTO mails (session_id, from_name, from_workspace, to_name, subject, body, mail_type, permission_options, permission_kind, permission_multi_select, created_at)
|
||||
VALUES ($1, $2, COALESCE((SELECT workspace FROM sessions WHERE session_id = $1), ''), $3, $4, $5, 'permission_request', $6, $7, $8, NOW()) RETURNING mail_id`,
|
||||
sessionID, fromName, toUser, "权限请求: "+question, body, optsJSON, kind, multiSelectInt,
|
||||
sessionID, fromName, toUser, subject, body, optsJSON, kind, multiSelectInt,
|
||||
).Scan(&id)
|
||||
return id, err
|
||||
}
|
||||
@ -390,6 +396,8 @@ func GetMailByID(ctx context.Context, id uuid.UUID) (*models.Mail, error) {
|
||||
`SELECT m.mail_id, m.session_id, m.parent_mail_id,
|
||||
m.from_name, m.from_workspace, m.to_name, m.to_workspace,
|
||||
m.cc_list, m.subject, m.body, m.mail_type, COALESCE(m.permission_result,'') AS permission_result,
|
||||
COALESCE(m.permission_kind,'') AS permission_kind,
|
||||
COALESCE(m.permission_multi_select,0) AS permission_multi_select,
|
||||
m.status, m.created_at, s.session_alias, s.workspace, m.rename_alias, m.rename_reason,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.from_name) AS from_human,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.to_name) AS to_human
|
||||
@ -399,6 +407,7 @@ func GetMailByID(ctx context.Context, id uuid.UUID) (*models.Mail, error) {
|
||||
).Scan(&m.ID, &m.SessionID, &m.ParentMailID,
|
||||
&m.FromName, &m.FromWorkspace, &m.ToName, &m.ToWorkspace,
|
||||
&ccJSON, &m.Subject, &m.Body, &m.MailType, &m.PermResult,
|
||||
&m.PermissionKind, &m.PermissionMulti,
|
||||
&m.Status, &m.CreatedAt, &alias, &m.SessionWorkspace, &renameAlias, &renameReason,
|
||||
&m.FromHuman, &m.ToHuman)
|
||||
if err != nil {
|
||||
@ -433,6 +442,8 @@ func ListInbox(ctx context.Context, agentName, status string, limit int) ([]mode
|
||||
q := `SELECT m.mail_id, m.session_id, m.parent_mail_id,
|
||||
m.from_name, m.from_workspace, m.to_name, m.to_workspace,
|
||||
m.cc_list, m.subject, m.body, m.mail_type, COALESCE(m.permission_result,'') AS permission_result,
|
||||
COALESCE(m.permission_kind,'') AS permission_kind,
|
||||
COALESCE(m.permission_multi_select,0) AS permission_multi_select,
|
||||
m.status, m.created_at, s.session_alias, s.workspace,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.from_name) AS from_human,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.to_name) AS to_human,
|
||||
@ -466,6 +477,7 @@ func ListInbox(ctx context.Context, agentName, status string, limit int) ([]mode
|
||||
if err := rows.Scan(&m.ID, &m.SessionID, &m.ParentMailID,
|
||||
&m.FromName, &m.FromWorkspace, &m.ToName, &m.ToWorkspace,
|
||||
&ccJSON, &m.Subject, &m.Body, &m.MailType, &m.PermResult,
|
||||
&m.PermissionKind, &m.PermissionMulti,
|
||||
&m.Status, &m.CreatedAt, &alias, &m.SessionWorkspace, &m.FromHuman, &m.ToHuman,
|
||||
&m.PermissionMode, &m.PermissionEnforcement); err != nil {
|
||||
return nil, err
|
||||
@ -508,6 +520,8 @@ func GetSessionMails(ctx context.Context, sessionID uuid.UUID) ([]models.Mail, e
|
||||
`SELECT m.mail_id, m.session_id, m.parent_mail_id,
|
||||
m.from_name, m.from_workspace, m.to_name, m.to_workspace,
|
||||
m.cc_list, m.subject, m.body, m.mail_type, COALESCE(m.permission_result,'') AS permission_result,
|
||||
COALESCE(m.permission_kind,'') AS permission_kind,
|
||||
COALESCE(m.permission_multi_select,0) AS permission_multi_select,
|
||||
m.status, m.created_at, s.session_alias, s.workspace,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.from_name) AS from_human,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.to_name) AS to_human
|
||||
@ -528,6 +542,7 @@ func GetSessionMails(ctx context.Context, sessionID uuid.UUID) ([]models.Mail, e
|
||||
if err := rows.Scan(&m.ID, &m.SessionID, &m.ParentMailID,
|
||||
&m.FromName, &m.FromWorkspace, &m.ToName, &m.ToWorkspace,
|
||||
&ccJSON, &m.Subject, &m.Body, &m.MailType, &m.PermResult,
|
||||
&m.PermissionKind, &m.PermissionMulti,
|
||||
&m.Status, &m.CreatedAt, &alias, &m.SessionWorkspace, &m.FromHuman, &m.ToHuman); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@ -633,6 +648,8 @@ func GetSessionMailByID(ctx context.Context, sessionID, mailID uuid.UUID) (*mode
|
||||
`SELECT m.mail_id, m.session_id, m.parent_mail_id,
|
||||
m.from_name, m.from_workspace, m.to_name, m.to_workspace,
|
||||
m.cc_list, m.subject, m.body, m.mail_type, COALESCE(m.permission_result,'') AS permission_result,
|
||||
COALESCE(m.permission_kind,'') AS permission_kind,
|
||||
COALESCE(m.permission_multi_select,0) AS permission_multi_select,
|
||||
m.status, m.created_at, s.session_alias, s.workspace,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.from_name) AS from_human,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.to_name) AS to_human
|
||||
@ -641,6 +658,7 @@ func GetSessionMailByID(ctx context.Context, sessionID, mailID uuid.UUID) (*mode
|
||||
).Scan(&m.ID, &m.SessionID, &m.ParentMailID,
|
||||
&m.FromName, &m.FromWorkspace, &m.ToName, &m.ToWorkspace,
|
||||
&ccJSON, &m.Subject, &m.Body, &m.MailType, &m.PermResult,
|
||||
&m.PermissionKind, &m.PermissionMulti,
|
||||
&m.Status, &m.CreatedAt, &alias, &m.SessionWorkspace, &m.FromHuman, &m.ToHuman)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@ -1166,6 +1184,8 @@ func ListSentBy(ctx context.Context, fromName string, limit int) ([]models.Mail,
|
||||
SELECT m.mail_id, m.session_id, m.parent_mail_id,
|
||||
m.from_name, m.from_workspace, m.to_name, m.to_workspace,
|
||||
m.cc_list, m.subject, m.body, m.mail_type, COALESCE(m.permission_result,'') AS permission_result,
|
||||
COALESCE(m.permission_kind,'') AS permission_kind,
|
||||
COALESCE(m.permission_multi_select,0) AS permission_multi_select,
|
||||
m.status, m.created_at, s.session_alias, s.workspace,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.from_name) AS from_human,
|
||||
EXISTS (SELECT 1 FROM users u WHERE u.username = m.to_name) AS to_human
|
||||
@ -1188,6 +1208,7 @@ func ListSentBy(ctx context.Context, fromName string, limit int) ([]models.Mail,
|
||||
if err := rows.Scan(&m.ID, &m.SessionID, &m.ParentMailID,
|
||||
&m.FromName, &m.FromWorkspace, &m.ToName, &m.ToWorkspace,
|
||||
&ccJSON, &m.Subject, &m.Body, &m.MailType, &m.PermResult,
|
||||
&m.PermissionKind, &m.PermissionMulti,
|
||||
&m.Status, &m.CreatedAt, &alias, &m.SessionWorkspace, &m.FromHuman, &m.ToHuman); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user