From 61b9402f6275a22c1e74c09dea36d722d994089e Mon Sep 17 00:00:00 2001 From: shenchen Date: Fri, 13 Nov 2026 16:27:12 +0800 Subject: [PATCH 1/6] feat: support project asset references in AI scheduled tasks --- internal/domain/assistant.go | 12 +++ internal/domain/sync.go | 12 ++- internal/httpapi/assistant_schedule.go | 80 +++++++++++++++ .../httpapi/assistant_task_engines_test.go | 13 ++- internal/httpapi/assistant_tasks.go | 21 +++- internal/httpapi/schedule.go | 19 ++++ internal/httpapi/schedule_test.go | 64 ++++++++++++ internal/httpapi/shared_schedules.go | 5 + web/app/sync-schedule.js | 99 +++++++++++++++++++ web/index.html | 17 ++++ web/schedule_dispatch_limit_test.go | 6 ++ web/sync.css | 10 ++ 12 files changed, 351 insertions(+), 7 deletions(-) diff --git a/internal/domain/assistant.go b/internal/domain/assistant.go index 4bbaf7bab..6529d6a1e 100644 --- a/internal/domain/assistant.go +++ b/internal/domain/assistant.go @@ -82,6 +82,17 @@ type AssistantReference struct { Element *AssistantPageElement `json:"element,omitempty"` } +// CloneAssistantReferences returns an independent copy for persisted task +// payloads and message construction. +func CloneAssistantReferences(refs []AssistantReference) []AssistantReference { + if len(refs) == 0 { + return nil + } + out := make([]AssistantReference, len(refs)) + copy(out, refs) + return out +} + // AssistantPageElement is a page element picked in the native preview. type AssistantPageElement struct { URL string `json:"url,omitempty"` @@ -175,6 +186,7 @@ type AssistantTask struct { UserID int64 `json:"userId,omitempty"` Name string `json:"name"` Prompt string `json:"prompt"` + References []AssistantReference `json:"references,omitempty"` Model string `json:"model,omitempty"` ProjectID string `json:"projectId,omitempty"` SessionID string `json:"sessionId,omitempty"` diff --git a/internal/domain/sync.go b/internal/domain/sync.go index 7a5d1bb6b..2c851aca4 100644 --- a/internal/domain/sync.go +++ b/internal/domain/sync.go @@ -79,10 +79,14 @@ type ScheduleJob struct { // Empty means backlog + todo. AI jobs leave this unused. IssueStatuses []string `json:"issueStatuses,omitempty"` // MaxDispatch caps successful SOP dispatches per execution. Zero defaults to 10. - MaxDispatch int `json:"maxDispatch,omitempty"` - IntervalSec int `json:"intervalSec"` - Cron string `json:"cron,omitempty"` - AssistantPrompt string `json:"assistantPrompt,omitempty"` + MaxDispatch int `json:"maxDispatch,omitempty"` + IntervalSec int `json:"intervalSec"` + Cron string `json:"cron,omitempty"` + AssistantPrompt string `json:"assistantPrompt,omitempty"` + // References are project assets selected for an AI scheduled task. The + // executor resolves them at run time so edits to the referenced assets are + // reflected on the next run. + References []AssistantReference `json:"references,omitempty"` AssistantModel string `json:"assistantModel,omitempty"` OwnerUserID int64 `json:"ownerUserId,omitempty"` LastRunAt time.Time `json:"lastRunAt,omitempty"` diff --git a/internal/httpapi/assistant_schedule.go b/internal/httpapi/assistant_schedule.go index d7be674a3..bc63c1495 100644 --- a/internal/httpapi/assistant_schedule.go +++ b/internal/httpapi/assistant_schedule.go @@ -31,9 +31,14 @@ func (h *assistantHandlers) prepareScheduleJob(job domain.ScheduleJob) (string, if err != nil { return "", err } + refs, err := h.normalizeScheduledReferences(job.ProjectID, job.References) + if err != nil { + return "", err + } task := assistantTask{ Name: job.Name, Prompt: prompt, + References: refs, Model: strings.TrimSpace(job.AssistantModel), ProjectID: job.ProjectID, Notifications: domain.CloneNotificationBindings(job.Notifications), @@ -52,6 +57,81 @@ func (h *assistantHandlers) prepareScheduleJob(job domain.ScheduleJob) (string, return firstNonEmpty(task.NotificationResult, task.LastMessage), nil } +// normalizeScheduledReferences shares the homepage resolver and stores only +// stable asset identity. Names and project metadata are presentation details; +// every execution resolves the current record again through prepareWorkbenchContext. +func (h *assistantHandlers) normalizeScheduledReferences(projectID string, refs []domain.AssistantReference) ([]domain.AssistantReference, error) { + if len(refs) == 0 { + return nil, nil + } + if len(refs) > 12 { + return nil, fmt.Errorf("AI 定时任务最多引用 12 个项目资产") + } + allowed := map[string]bool{"agent": true, "skill": true, "sop": true, "issue": true, "run": true, "repository": true} + seen := map[string]bool{} + out := make([]domain.AssistantReference, 0, len(refs)) + for _, raw := range refs { + typ, id := strings.TrimSpace(raw.Type), strings.TrimSpace(raw.ID) + if !allowed[typ] || id == "" { + return nil, fmt.Errorf("定时任务引用的项目资产无效") + } + key := typ + "\x00" + id + if seen[key] { + continue + } + seen[key] = true + canonical, _, err := h.workbenchReference(domain.AssistantReference{Type: typ, ID: id}, projectID) + if err != nil { + return nil, fmt.Errorf("定时任务引用资产 %s/%s 不可用:%w", typ, id, err) + } + out = append(out, domain.AssistantReference{Type: canonical.Type, ID: canonical.ID}) + } + return out, nil +} + +func (h *assistantHandlers) scheduledMessageReferences(projectID string, refs []domain.AssistantReference) ([]domain.AssistantReference, error) { + out := make([]domain.AssistantReference, 0, len(refs)) + for _, ref := range refs { + canonical, _, err := h.workbenchReference(ref, projectID) + if err != nil { + return nil, err + } + ownerProject := projectID + switch ref.Type { + case "issue": + if v, ok := h.repo.Issue(ref.ID); ok { + ownerProject = v.ProjectID + } + case "run": + if v, ok := h.repo.RunState(ref.ID); ok { + ownerProject = v.ExecutionContext.ProjectID + } + case "repository": + if v, ok := h.repo.Repository(ref.ID); ok { + ownerProject = v.ProjectID + } + case "agent": + if v, ok := h.repo.Agent(ref.ID); ok && v.Shared { + ownerProject = v.ProjectID + } + case "skill": + if v, ok := h.repo.Skill(ref.ID); ok && v.Shared { + ownerProject = v.ProjectID + } + case "sop": + if v, ok := h.repo.Workflow(ref.ID); ok && (v.Shared || v.Generic) { + ownerProject = v.ProjectID + } + } + canonical.ProjectID = ownerProject + if p, ok := h.repo.Project(ownerProject); ok { + canonical.ProjectName = p.Name + } + out = append(out, canonical) + } + return out, nil +} + // scheduleJobAssistantUser picks whose keys run the job: the project owner, // else (for a non-shared job) its owner. The model's CLI decides which key // they need. A scheduled run does not borrow the platform shared CodeBuddy key. diff --git a/internal/httpapi/assistant_task_engines_test.go b/internal/httpapi/assistant_task_engines_test.go index f4699870a..ddcb57f2c 100644 --- a/internal/httpapi/assistant_task_engines_test.go +++ b/internal/httpapi/assistant_task_engines_test.go @@ -121,14 +121,17 @@ func joinScheduledProject(t *testing.T, st *repo.Store, projectID string, userID func TestScheduledTaskRunsAsChatTurn(t *testing.T) { st := cvAStore(t) _ = st.PutProject(domain.Project{ID: "turn-project", Name: "Turn"}) + _ = st.PutIssue(domain.Issue{ID: "turn-issue", ProjectID: "turn-project", Title: "最新需求标题", Description: "需求详情", Status: "todo"}) _ = st.PutUser(domain.User{LoginName: "turn-user", CodeBuddyAPIKey: "secret"}) user, _ := st.UserByLoginName("turn-user") h := &assistantHandlers{deps: &deps{repo: st}} - task := assistantTask{ID: "turn-job", Name: "巡检", Prompt: "检查", ProjectID: "turn-project", IntervalSec: 60, Enabled: true} + task := assistantTask{ID: "turn-job", Name: "巡检", Prompt: "检查", ProjectID: "turn-project", IntervalSec: 60, Enabled: true, References: []domain.AssistantReference{{Type: "issue", ID: "turn-issue", Name: "客户端伪造名称"}}} var during domain.AssistantGeneration live := false - h.generate = func(context.Context, string, domain.User) (string, error) { + var generatedPrompt string + h.generate = func(_ context.Context, prompt string, _ domain.User) (string, error) { + generatedPrompt = prompt during, _ = st.AssistantGeneration(user.ID, task.SessionID) _, live = assistantLiveGenerations.Load(during.ID) return "巡检完成\n\n```notification\n{\"title\":\"T\",\"summary\":\"S\",\"body\":\"B\"}\n```", nil @@ -146,6 +149,9 @@ func TestScheduledTaskRunsAsChatTurn(t *testing.T) { if task.LastStatus != "ok" || task.LastMessage != "巡检完成" || !strings.Contains(task.NotificationResult, "```notification") { t.Fatalf("task result = %+v", task) } + if !strings.Contains(generatedPrompt, "最新需求标题") || strings.Contains(generatedPrompt, "客户端伪造名称") { + t.Fatalf("scheduled reference context = %q", generatedPrompt) + } session, _ := st.AssistantSession(user.ID, task.SessionID) if session.Source != domain.AssistantSourceScheduled || session.TaskID != task.ID || session.Title != "定时 · 巡检" { t.Fatalf("scheduled session metadata = source %q task %q title %q", session.Source, session.TaskID, session.Title) @@ -153,6 +159,9 @@ func TestScheduledTaskRunsAsChatTurn(t *testing.T) { if n := len(session.Messages); n != 2 || session.Messages[1].Model == "" || strings.Contains(session.Messages[1].Content, "```notification") { t.Fatalf("stored transcript = %+v", session.Messages) } + if len(session.Messages[0].References) != 1 || session.Messages[0].References[0].Name != "最新需求标题" { + t.Fatalf("resolved scheduled references = %+v", session.Messages[0].References) + } first := task.SessionID if err := h.executeAssistantTask(context.Background(), user, &task); err != nil { diff --git a/internal/httpapi/assistant_tasks.go b/internal/httpapi/assistant_tasks.go index f69c8f7ce..2fcb32d56 100644 --- a/internal/httpapi/assistant_tasks.go +++ b/internal/httpapi/assistant_tasks.go @@ -79,6 +79,14 @@ func (h *assistantHandlers) putTask(c *gin.Context) { c.JSON(404, gin.H{"error": "项目不存在"}) return } + if len(task.References) > 0 { + refs, err := h.normalizeScheduledReferences(task.ProjectID, task.References) + if err != nil { + c.JSON(400, gin.H{"error": err.Error()}) + return + } + task.References = refs + } if len(task.Notifications) > 0 || len(existing.Notifications) > 0 { if h.notifications == nil || !h.notifications.access(c, task.ProjectID, true) { @@ -201,6 +209,17 @@ func (h *assistantHandlers) executeAssistantTask(ctx context.Context, user domai return errAssistantBusy } defer h.active.Delete(user.ID) + if refs, err := h.normalizeScheduledReferences(task.ProjectID, task.References); err != nil { + task.LastStatus, task.LastError = "error", err.Error() + return err + } else { + task.References = refs + } + messageReferences, err := h.scheduledMessageReferences(task.ProjectID, task.References) + if err != nil { + task.LastStatus, task.LastError = "error", err.Error() + return err + } ctx = withAssistantExecMode(ctx, assistantExecModeForApproval(AssistantApprovalAuto)) mode := assistantExecModeFrom(ctx) origin := assistantSessionOriginFrom(ctx) @@ -243,7 +262,7 @@ func (h *assistantHandlers) executeAssistantTask(ctx context.Context, user domai SessionID: sessionID, Model: model, Executor: cliEngine, - Messages: []assistantMessage{{Role: "user", Content: scheduledAssistantPrompt(*task, mode), AuthorID: user.ID, AuthorName: user.LoginName, CreatedAt: now}}, + Messages: []assistantMessage{{Role: "user", Content: scheduledAssistantPrompt(*task, mode), AuthorID: user.ID, AuthorName: user.LoginName, CreatedAt: now, References: messageReferences}}, } g := domain.AssistantGeneration{StartedAt: now, ActorID: user.ID, ActorName: user.LoginName, ID: newAssistantSessionID(), SessionID: sessionID, UserID: user.ID, ProjectID: task.ProjectID, Status: "running", Events: []domain.AssistantGenerationEvent{}, MessageCount: len(req.Messages)} pending := assistantConversation{ID: sessionID, Title: "定时 · " + task.Name, ProjectID: task.ProjectID, Model: model, Executor: cliEngine, Source: origin.Source, TaskID: origin.TaskID, Messages: req.Messages} diff --git a/internal/httpapi/schedule.go b/internal/httpapi/schedule.go index e87042d5a..a69a759be 100644 --- a/internal/httpapi/schedule.go +++ b/internal/httpapi/schedule.go @@ -64,6 +64,7 @@ func (h *scheduleHandlers) scheduleJobs(c *gin.Context) { job.Cron = strings.TrimSpace(job.Cron) job.AssistantPrompt = strings.TrimSpace(job.AssistantPrompt) job.AssistantModel = strings.TrimSpace(job.AssistantModel) + job.References = domain.CloneAssistantReferences(job.References) job.WorkflowID = strings.TrimSpace(job.WorkflowID) source, err := domain.NormalizeScheduleSource(job.Source) if err != nil { @@ -81,7 +82,20 @@ func (h *scheduleHandlers) scheduleJobs(c *gin.Context) { job.IssueStatuses = nil job.MaxDispatch = 0 job.Source = "" + if len(job.References) > 0 { + if h.assistant == nil { + c.JSON(http.StatusServiceUnavailable, map[string]string{"error": "AI 定时任务引用功能未就绪"}) + return + } + refs, err := h.assistant.normalizeScheduledReferences(job.ProjectID, job.References) + if err != nil { + c.JSON(400, map[string]string{"error": err.Error()}) + return + } + job.References = refs + } } else { + job.References = nil if job.MaxDispatch < 0 || job.MaxDispatch > domain.MaxScheduleDispatch { c.JSON(400, map[string]string{"error": "单次最多触发需求数必须为 1–10,不配置时默认为 10"}) return @@ -183,6 +197,11 @@ func (h *scheduleHandlers) scheduleJobs(c *gin.Context) { return } stored, _ := h.repo.ScheduleJob(job.ID) + visible := h.visibleScheduleJobs(c.Request, []domain.ScheduleJob{stored}) + if len(visible) == 1 { + c.JSON(200, visible[0]) + return + } c.JSON(200, stored) } } diff --git a/internal/httpapi/schedule_test.go b/internal/httpapi/schedule_test.go index 2a2b9f748..7337d55e5 100644 --- a/internal/httpapi/schedule_test.go +++ b/internal/httpapi/schedule_test.go @@ -67,6 +67,13 @@ func TestScheduleJobCRUD(t *testing.T) { if custom.MaxDispatch != 3 { t.Fatalf("custom dispatch limit = %d", custom.MaxDispatch) } + dispatchRefs := requestJSON[domain.ScheduleJob](t, h, http.MethodPut, "/api/schedule-jobs", map[string]any{ + "id": custom.ID, "name": custom.Name, "workflowId": custom.WorkflowID, + "references": []map[string]any{{"type": "issue", "id": "missing"}}, + }, http.StatusOK) + if len(dispatchRefs.References) != 0 { + t.Fatalf("dispatch job retained AI references: %+v", dispatchRefs.References) + } if got := strings.Join(custom.IssueStatuses, ","); got != "todo,in_progress" { t.Fatalf("normalized issue statuses = %q", got) } @@ -112,6 +119,63 @@ func TestScheduleJobCRUD(t *testing.T) { } } +func TestAIScheduleReferencesPersistIdentityAndRefreshDisplayData(t *testing.T) { + st, err := repo.OpenTest() + if err != nil { + t.Fatal(err) + } + t.Cleanup(st.Close) + issue := domain.Issue{ID: "scheduled-ref-issue", ProjectID: "platform", Title: "初始标题", Description: "详情", Status: "todo"} + if err := st.PutIssue(issue); err != nil { + t.Fatal(err) + } + if err := st.PutProject(domain.Project{ID: "scheduled-ref-foreign", Name: "Foreign", OwnerID: 99}); err != nil { + t.Fatal(err) + } + if err := st.PutIssue(domain.Issue{ID: "scheduled-ref-foreign-issue", ProjectID: "scheduled-ref-foreign", Title: "跨项目"}); err != nil { + t.Fatal(err) + } + h := New(st, engine.New(st, runtime.NewManager(filepath.Join(t.TempDir(), "workspaces"))), tracker.NewService(), "", "") + saved := requestJSON[domain.ScheduleJob](t, h, http.MethodPost, "/api/schedule-jobs", map[string]any{ + "name": "引用需求", "projectId": "platform", "skipDispatch": true, + "intervalSec": 3600, "assistantPrompt": "读取需求", "enabled": true, + "references": []map[string]any{{"type": "issue", "id": issue.ID, "name": "伪造名称", "projectId": "别的项目"}}, + }, http.StatusOK) + if len(saved.References) != 1 || saved.References[0].Type != "issue" || saved.References[0].ID != issue.ID { + t.Fatalf("saved references = %+v", saved.References) + } + if saved.References[0].Name != issue.Title || saved.References[0].ProjectID != issue.ProjectID { + t.Fatalf("response should resolve current display data: %+v", saved.References[0]) + } + stored, ok := st.ScheduleJob(saved.ID) + if !ok || len(stored.References) != 1 || stored.References[0].Name != "" || stored.References[0].ProjectID != "" { + t.Fatalf("stored references must keep only identity: %+v", stored.References) + } + issue.Title = "更新后的标题" + if err := st.PutIssue(issue); err != nil { + t.Fatal(err) + } + assistant := &assistantHandlers{deps: &deps{repo: st}} + canonical, data, err := assistant.workbenchReference(domain.AssistantReference{Type: "issue", ID: issue.ID}, "platform") + if err != nil { + t.Fatal(err) + } + if canonical.Name != issue.Title || !strings.Contains(data, "更新后的标题") { + t.Fatalf("runtime reference did not refresh: canonical=%+v data=%s", canonical, data) + } + if _, err := assistant.normalizeScheduledReferences("platform", []domain.AssistantReference{{Type: "issue", ID: "missing"}}); err == nil { + t.Fatal("missing scheduled reference should be rejected") + } + if _, err := assistant.normalizeScheduledReferences("platform", []domain.AssistantReference{{Type: "element", ID: "x"}}); err == nil { + t.Fatal("unsupported scheduled reference type should be rejected") + } + requestJSON[map[string]string](t, h, http.MethodPost, "/api/schedule-jobs", map[string]any{ + "name": "跨项目引用", "projectId": "platform", "skipDispatch": true, + "intervalSec": 3600, "assistantPrompt": "读取需求", "enabled": true, + "references": []map[string]any{{"type": "issue", "id": "scheduled-ref-foreign-issue"}}, + }, http.StatusBadRequest) +} + func TestScheduledDispatchUsesIntegrationBranchAndManualDispatchDoesNot(t *testing.T) { st, err := repo.OpenTest() if err != nil { diff --git a/internal/httpapi/shared_schedules.go b/internal/httpapi/shared_schedules.go index 19f03259f..bfba121a6 100644 --- a/internal/httpapi/shared_schedules.go +++ b/internal/httpapi/shared_schedules.go @@ -66,6 +66,11 @@ func (h *scheduleHandlers) visibleScheduleJobs(r *http.Request, jobs []domain.Sc out := make([]domain.ScheduleJob, 0, len(jobs)) for _, job := range jobs { if h.scheduleJobAllowed(r, job, false) { + if h.assistant != nil && len(job.References) > 0 { + if refs, err := h.assistant.scheduledMessageReferences(job.ProjectID, job.References); err == nil { + job.References = refs + } + } out = append(out, job) } } diff --git a/web/app/sync-schedule.js b/web/app/sync-schedule.js index 7ce9a3582..c72042254 100644 --- a/web/app/sync-schedule.js +++ b/web/app/sync-schedule.js @@ -1,4 +1,7 @@ let scheduleNotificationBindings=[]; +let scheduleReferences=[]; +let scheduleReferenceRequest=0; +let scheduleReferenceSearchTimer=null; let scheduleEditorKind='dispatch'; let scheduleModalVersion=0; let scheduleModalOpener=null; @@ -98,6 +101,78 @@ function scheduleIssueStatusValues(job){ return ['backlog','todo']; } function scheduleModelAPI(){return window.AgentFlowAssistantModels} +const scheduleReferenceLabels={agent:'角色',skill:'技能',sop:'SOP',issue:'需求',run:'运行',repository:'仓库'}; +function scheduleReferenceKey(ref){return `${ref?.type||''}/${ref?.id||''}`} +function renderScheduleReferences(){ + const host=$('#scheduleReferenceList'); + if(!host)return; + host.innerHTML=scheduleReferences.length?scheduleReferences.map(ref=>`${escapeHTML(scheduleReferenceLabels[ref.type]||ref.type)} · ${escapeHTML(ref.name||ref.id)}`).join(''):'尚未引用项目资产'; + host.querySelectorAll('[data-remove-schedule-reference]').forEach(button=>button.onclick=()=>{ + const key=button.dataset.removeScheduleReference; + scheduleReferences=scheduleReferences.filter(ref=>scheduleReferenceKey(ref)!==key); + renderScheduleReferences(); + loadScheduleReferenceOptions(); + }); +} +async function loadScheduleReferenceOptions(){ + const host=$('#scheduleReferenceOptions'); + if(!host)return; + const request=++scheduleReferenceRequest,modalVersion=scheduleModalVersion; + const projectId=state.projectFilter||''; + if(!projectId){host.innerHTML='
请先选择项目。
';return} + host.innerHTML='
读取项目资产…
'; + try{ + const params=new URLSearchParams({projectId,type:$('#scheduleReferenceType')?.value||'',q:$('#scheduleReferenceQuery')?.value.trim()||'',offset:'0'}); + const data=await api('/api/assistant/references?'+params.toString()); + if(request!==scheduleReferenceRequest||modalVersion!==scheduleModalVersion||projectId!==state.projectFilter)return; + const rows=data.items||data||[]; + host.innerHTML=rows.length?rows.map(ref=>{ + const selected=scheduleReferences.some(item=>scheduleReferenceKey(item)===scheduleReferenceKey(ref)); + return ``; + }).join(''):'
没有找到可引用的项目资产。
'; + host.querySelectorAll('[data-schedule-reference]').forEach(button=>button.onclick=()=>{ + const ref=rows.find(item=>scheduleReferenceKey(item)===button.dataset.scheduleReference); + if(!ref)return; + if(!scheduleReferences.some(item=>scheduleReferenceKey(item)===scheduleReferenceKey(ref))){ + if(scheduleReferences.length>=12)return toast('每个定时任务最多引用 12 个项目资产','warn'); + scheduleReferences=[...scheduleReferences,ref]; + } + renderScheduleReferences(); + loadScheduleReferenceOptions(); + }); + }catch(err){ + if(request===scheduleReferenceRequest&&modalVersion===scheduleModalVersion&&projectId===state.projectFilter)host.innerHTML=`
读取项目资产失败:${escapeHTML(err.message)}
` + } +} +function bindScheduleReferencePicker(){ + const add=$('#scheduleAddReference'),picker=$('#scheduleReferencePicker'); + if(!add||!picker||add.dataset.bound)return; + add.dataset.bound='1'; + add.onclick=()=>{picker.hidden=!picker.hidden;add.setAttribute('aria-expanded',String(!picker.hidden));if(!picker.hidden){loadScheduleReferenceOptions();$('#scheduleReferenceQuery')?.focus()}}; + $('#scheduleReferenceType')?.addEventListener('change',loadScheduleReferenceOptions); + $('#scheduleReferenceQuery')?.addEventListener('input',()=>{clearTimeout(scheduleReferenceSearchTimer);scheduleReferenceSearchTimer=setTimeout(loadScheduleReferenceOptions,180)}); + const options=$('#scheduleReferenceOptions'); + options?.addEventListener('keydown',event=>{ + const items=[...options.querySelectorAll('[data-schedule-reference]')]; + if(!items.length||!['ArrowDown','ArrowUp','Home','End'].includes(event.key))return; + event.preventDefault(); + const current=items.indexOf(document.activeElement); + const next=event.key==='Home'?0:event.key==='End'?items.length-1:Math.max(0,(current+(event.key==='ArrowDown'?1:-1)+items.length)%items.length); + items[next]?.focus(); + }); + picker.addEventListener('keydown',event=>{ + if(event.key!=='Escape')return; + event.preventDefault(); + picker.hidden=true; + add.setAttribute('aria-expanded','false'); + add.focus(); + }); + document.addEventListener('pointerdown',event=>{ + if(picker.hidden||picker.contains(event.target)||event.target===add)return; + picker.hidden=true; + add.setAttribute('aria-expanded','false'); + }); +} function selectedClarifyModel(){ const api=window.AgentFlowAssistantModels; const stored=localStorage.getItem('agentflow.clarifyModel')||''; @@ -296,6 +371,10 @@ function fillScheduleJobForm(job={}){ if(!cron)f.elements.intervalSec.value=interval; f.elements.jobKind.value=job.id?scheduleJobKind(job):scheduleEditorKind; f.elements.assistantPrompt.value=job.assistantPrompt||''; + scheduleReferences=Array.isArray(job.references) + ?job.references.filter(ref=>ref&&ref.type&&ref.id).slice(0,12).map(ref=>({type:String(ref.type),id:String(ref.id),name:String(ref.name||''),projectId:String(ref.projectId||''),projectName:String(ref.projectName||'')})) + :[]; + renderScheduleReferences(); f.elements.assistantModel.value=job.assistantModel||scheduleModelAPI()?.DEFAULT||'default'; f.elements.useIssueWorkflow.checked=job.id?!!job.useIssueWorkflow:true; f.elements.maxDispatch.value=job.maxDispatch||''; @@ -317,6 +396,13 @@ function projectTriggerJob(){return scheduleJobsInView(state.data.scheduleJobs,s function resetScheduleJobForm(){fillScheduleJobForm(scheduleEditorKind==='dispatch'?(projectTriggerJob()||{}):{})} function closeScheduleJobModal(){ scheduleModalVersion++; + scheduleReferenceRequest++; + clearTimeout(scheduleReferenceSearchTimer); + scheduleReferences=[]; + const picker=$('#scheduleReferencePicker'); + if(picker)picker.hidden=true; + const addReference=$('#scheduleAddReference'); + if(addReference)addReference.setAttribute('aria-expanded','false'); const modal=$('#scheduleModal'); if(!modal.classList.contains('open'))return; modal.classList.remove('open'); @@ -335,6 +421,18 @@ async function openScheduleJobModal(kind='dispatch',job){ scheduleModalOpener=document.activeElement; if(scheduleModalOpener?.closest('#issueHeadingMenu'))scheduleModalOpener=$('#issueHeadingMore'); const f=$('#scheduleJobForm'); + bindScheduleReferencePicker(); + scheduleReferences=[]; + scheduleReferenceRequest++; + clearTimeout(scheduleReferenceSearchTimer); + const picker=$('#scheduleReferencePicker'); + if(picker)picker.hidden=true; + const addReference=$('#scheduleAddReference'); + if(addReference)addReference.setAttribute('aria-expanded','false'); + const referenceQuery=$('#scheduleReferenceQuery'); + if(referenceQuery)referenceQuery.value=''; + const referenceType=$('#scheduleReferenceType'); + if(referenceType)referenceType.value=''; f.inert=false; f.querySelector('[type="submit"]').disabled=false; if(scheduleEditorKind==='assistant')fillScheduleJobForm(job||{}); @@ -494,6 +592,7 @@ async function saveScheduleJob(e){ cron:cron?f.elements.cron.value.trim():'', assistantPrompt:assistant?f.elements.assistantPrompt.value.trim():'', assistantModel:assistant?f.elements.assistantModel.value.trim():'', + references:assistant?scheduleReferences.map(ref=>({type:ref.type,id:ref.id})):[], enabled:f.elements.enabled.checked }; if(assistant&&typeof sharedScheduleFormPayload==='function')Object.assign(payload,sharedScheduleFormPayload(f)); diff --git a/web/index.html b/web/index.html index 892bb9ff5..d7390f715 100644 --- a/web/index.html +++ b/web/index.html @@ -1170,6 +1170,23 @@

触发配置

到点以与主页 AI 对话相同的完全权限执行提示词,可按需读写平台、启动 SOP、操作工作区及浏览器。

+
diff --git a/web/schedule_dispatch_limit_test.go b/web/schedule_dispatch_limit_test.go index 4c17c7757..96e912445 100644 --- a/web/schedule_dispatch_limit_test.go +++ b/web/schedule_dispatch_limit_test.go @@ -15,6 +15,8 @@ const assert = require('node:assert/strict'); const fs = require('node:fs'); const code = fs.readFileSync('app/sync-schedule.js', 'utf8'); const html = fs.readFileSync('index.html', 'utf8'); +assert.match(html, /id="scheduleAddReference"/); +assert.match(html, /id="scheduleReferenceOptions"/); const input = html.match(/]*name="maxDispatch"[^>]*>/)[0]; assert.ok(input.includes('type="number"') && input.includes('min="1"') && input.includes('max="10"')); assert.ok(!input.includes('required'), 'dispatch limit must be optional'); @@ -32,6 +34,7 @@ global.renderScheduleJobs=()=>{}; global.api=async (path,options)=>{saved=JSON.parse(options.body); return {...saved,id:'job'}}; global.notificationPayload=()=>[]; global.scheduleNotificationBindings=[]; +global.scheduleReferences=[]; global.scheduleModalVersion=0; global.closeScheduleJobModal=()=>{}; eval(code.slice(code.indexOf('async function saveScheduleJob('),code.indexOf('function scheduleJobOutcomeToast('))); @@ -53,6 +56,9 @@ async function submit(value) { form.elements.jobKind.value='assistant'; form.elements.assistantPrompt.value='report'; assert.ok(!Object.hasOwn(await submit('3'),'maxDispatch'), 'AI jobs must not include the dispatch limit'); + global.scheduleReferences=[{type:'issue',id:'i1',name:'需求'}]; + const aiPayload=await submit(''); + assert.deepEqual(aiPayload.references,[{type:'issue',id:'i1'}]); })().catch(error=>{console.error(error);process.exit(1)}); ` if out, err := exec.Command(node, "-e", script).CombinedOutput(); err != nil { diff --git a/web/sync.css b/web/sync.css index ca0467c46..955950274 100644 --- a/web/sync.css +++ b/web/sync.css @@ -80,6 +80,16 @@ .schedule-tabs button{height:32px;border:0;border-radius:8px;padding:0 10px;background:transparent;color:var(--muted);font-size:12px;font-weight:620;cursor:pointer} .schedule-tabs button.is-active{background:var(--panel);color:var(--text);box-shadow:0 1px 2px color-mix(in srgb,var(--text) 10%,transparent)} .schedule-field-hint{margin:6px 0 0;font-size:11px;line-height:1.5;color:var(--muted-2)} +.schedule-reference-list{display:flex;flex-wrap:wrap;gap:6px;margin:0 0 8px;min-height:4px} +.schedule-reference-chip{display:inline-flex;align-items:center;gap:6px;padding:5px 8px;border:1px solid var(--line-strong);border-radius:8px;background:var(--bg-soft);font-size:11px;color:var(--text)} +.schedule-reference-chip button{padding:0;border:0;background:none;color:var(--muted);cursor:pointer;font-size:14px;line-height:1} +.schedule-reference-picker{margin-top:9px;padding:9px;border:1px solid var(--line-strong);border-radius:9px;background:var(--bg-soft)} +.schedule-reference-toolbar{display:grid;grid-template-columns:minmax(110px,.4fr) minmax(0,1fr);gap:7px;margin-bottom:8px} +.schedule-reference-option{display:flex;align-items:center;justify-content:space-between;gap:8px;width:100%;padding:7px 8px;border:0;border-radius:7px;background:transparent;color:var(--text);text-align:left;cursor:pointer} +.schedule-reference-option:hover{background:var(--hover)} +.schedule-reference-option:focus-visible{outline:2px solid var(--blue);outline-offset:-2px} +.schedule-reference-option small{color:var(--muted-2)} +.schedule-references .sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0} .schedule-check{display:flex;align-items:flex-start;gap:8px;margin:0;font-size:12px;line-height:1.45;color:var(--text);font-weight:600;cursor:pointer} .schedule-check input{margin-top:2px} .schedule-check-follow{margin-top:10px} From c75daa0686a37a598e40321afedc52aa0237e2e0 Mon Sep 17 00:00:00 2001 From: shenchen Date: Fri, 13 Nov 2026 20:04:16 +0800 Subject: [PATCH 2/6] fix: address scheduled task review feedback --- .../assistant_schedule_references_test.go | 101 ++++++++++++++++++ internal/httpapi/assistant_tasks.go | 4 + web/app/sync-schedule.js | 6 +- 3 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 internal/httpapi/assistant_schedule_references_test.go diff --git a/internal/httpapi/assistant_schedule_references_test.go b/internal/httpapi/assistant_schedule_references_test.go new file mode 100644 index 000000000..d3144839f --- /dev/null +++ b/internal/httpapi/assistant_schedule_references_test.go @@ -0,0 +1,101 @@ +package httpapi + +import ( + "fmt" + "net/http" + "strings" + "testing" + + "agentflow/internal/domain" +) + +func TestNormalizeScheduledReferencesLimitDedupAndTrim(t *testing.T) { + st := cvAStore(t) + _ = st.PutProject(domain.Project{ID: "ref-norm", Name: "Norm"}) + _ = st.PutIssue(domain.Issue{ID: "ref-norm-issue", ProjectID: "ref-norm", Title: "需求"}) + h := &assistantHandlers{deps: &deps{repo: st}} + + tooMany := make([]domain.AssistantReference, 13) + for i := range tooMany { + tooMany[i] = domain.AssistantReference{Type: "issue", ID: fmt.Sprintf("x-%d", i)} + } + if _, err := h.normalizeScheduledReferences("ref-norm", tooMany); err == nil || !strings.Contains(err.Error(), "12") { + t.Fatalf("13 references should be rejected by the limit, err = %v", err) + } + if refs, err := h.normalizeScheduledReferences("ref-norm", nil); err != nil || refs != nil { + t.Fatalf("empty references = %+v, %v", refs, err) + } + if _, err := h.normalizeScheduledReferences("ref-norm", []domain.AssistantReference{{Type: "issue", ID: " "}}); err == nil { + t.Fatal("blank reference ID should be rejected") + } + + refs, err := h.normalizeScheduledReferences("ref-norm", []domain.AssistantReference{ + {Type: " issue ", ID: " ref-norm-issue ", Name: "伪造", ProjectID: "other"}, + {Type: "issue", ID: "ref-norm-issue"}, + }) + if err != nil { + t.Fatal(err) + } + if len(refs) != 1 || refs[0] != (domain.AssistantReference{Type: "issue", ID: "ref-norm-issue"}) { + t.Fatalf("trimmed, deduplicated identity-only references = %+v", refs) + } +} + +func TestScheduledMessageReferencesResolveOwnerProject(t *testing.T) { + st := cvAStore(t) + _ = st.PutProject(domain.Project{ID: "ref-home", Name: "Home"}) + _ = st.PutProject(domain.Project{ID: "ref-lib", Name: "Library"}) + _ = st.PutRepository(domain.Repository{ID: "ref-repo", ProjectID: "ref-home", Name: "app"}) + _ = st.PutAgent(domain.AgentDefinition{ID: "ref-agent", ProjectID: "ref-lib", Name: "共享 Agent", Shared: true}) + _ = st.PutSkill(domain.SkillDefinition{ID: "ref-skill", ProjectID: "ref-lib", Name: "共享技能", Shared: true}) + _ = st.PutRun(domain.Run{ID: "ref-run", Status: "succeeded", WorkflowSnapshot: domain.WorkflowDefinition{Name: "巡检"}, ExecutionContext: domain.TelemetryContext{ProjectID: "ref-home"}}) + h := &assistantHandlers{deps: &deps{repo: st}} + + got, err := h.scheduledMessageReferences("ref-home", []domain.AssistantReference{ + {Type: "repository", ID: "ref-repo"}, + {Type: "run", ID: "ref-run"}, + {Type: "agent", ID: "ref-agent"}, + {Type: "skill", ID: "ref-skill"}, + }) + if err != nil { + t.Fatal(err) + } + want := []domain.AssistantReference{ + {Type: "repository", ID: "ref-repo", Name: "app", ProjectID: "ref-home", ProjectName: "Home"}, + {Type: "run", ID: "ref-run", Name: "巡检 · ref-run", ProjectID: "ref-home", ProjectName: "Home"}, + {Type: "agent", ID: "ref-agent", Name: "共享 Agent", ProjectID: "ref-lib", ProjectName: "Library"}, + {Type: "skill", ID: "ref-skill", Name: "共享技能", ProjectID: "ref-lib", ProjectName: "Library"}, + } + if len(got) != len(want) { + t.Fatalf("references = %+v", got) + } + for i := range want { + if got[i] != want[i] { + t.Errorf("reference %d = %+v, want %+v", i, got[i], want[i]) + } + } + + if _, err := h.scheduledMessageReferences("ref-home", []domain.AssistantReference{{Type: "repository", ID: "gone"}}); err == nil { + t.Fatal("missing reference should fail message construction") + } +} + +func TestAssistantTaskReferenceSaveRequiresProjectAccess(t *testing.T) { + st := cvAStore(t) + _ = st.PutUser(domain.User{LoginName: "ref-owner"}) + _ = st.PutUser(domain.User{LoginName: "ref-outsider"}) + owner, _ := st.UserByLoginName("ref-owner") + outsider, _ := st.UserByLoginName("ref-outsider") + _ = st.PutProject(domain.Project{ID: "private-ref-project", Name: "Private", OwnerID: owner.ID}) + _ = st.PutIssue(domain.Issue{ID: "private-ref-issue", ProjectID: "private-ref-project", Title: "secret issue"}) + h := &assistantHandlers{deps: &deps{repo: st}} + + c, rec := cvAContext(t, http.MethodPut, "/api/assistant/tasks", `{"name":"job","prompt":"inspect","projectId":"private-ref-project","intervalSec":60,"references":[{"type":"issue","id":"private-ref-issue"}]}`, &outsider) + h.putTask(c) + if rec.Code != http.StatusForbidden { + t.Fatalf("outsider save = %d %s", rec.Code, rec.Body.String()) + } + if strings.Contains(rec.Body.String(), "不可用") || strings.Contains(rec.Body.String(), "不存在") { + t.Fatalf("permission response reveals reference existence: %s", rec.Body.String()) + } +} diff --git a/internal/httpapi/assistant_tasks.go b/internal/httpapi/assistant_tasks.go index 2fcb32d56..afff10d63 100644 --- a/internal/httpapi/assistant_tasks.go +++ b/internal/httpapi/assistant_tasks.go @@ -79,6 +79,10 @@ func (h *assistantHandlers) putTask(c *gin.Context) { c.JSON(404, gin.H{"error": "项目不存在"}) return } + if !h.workbenchProjectAllowed(c, task.ProjectID, current.ID) { + c.JSON(403, gin.H{"error": "无权访问项目"}) + return + } if len(task.References) > 0 { refs, err := h.normalizeScheduledReferences(task.ProjectID, task.References) if err != nil { diff --git a/web/app/sync-schedule.js b/web/app/sync-schedule.js index c72042254..2c4c34b8b 100644 --- a/web/app/sync-schedule.js +++ b/web/app/sync-schedule.js @@ -139,6 +139,7 @@ async function loadScheduleReferenceOptions(){ } renderScheduleReferences(); loadScheduleReferenceOptions(); + $('#scheduleReferenceQuery')?.focus(); }); }catch(err){ if(request===scheduleReferenceRequest&&modalVersion===scheduleModalVersion&&projectId===state.projectFilter)host.innerHTML=`
读取项目资产失败:${escapeHTML(err.message)}
` @@ -160,9 +161,10 @@ function bindScheduleReferencePicker(){ const next=event.key==='Home'?0:event.key==='End'?items.length-1:Math.max(0,(current+(event.key==='ArrowDown'?1:-1)+items.length)%items.length); items[next]?.focus(); }); - picker.addEventListener('keydown',event=>{ - if(event.key!=='Escape')return; + (picker.closest('.schedule-references')||picker).addEventListener('keydown',event=>{ + if(event.key!=='Escape'||picker.hidden)return; event.preventDefault(); + event.stopPropagation(); picker.hidden=true; add.setAttribute('aria-expanded','false'); add.focus(); From 6d0ea8c86ba0d4d20be53d787fcf4fd2c4ca2795 Mon Sep 17 00:00:00 2001 From: shenchen Date: Fri, 13 Nov 2026 20:20:40 +0800 Subject: [PATCH 3/6] test: cover scheduled reference normalization and failures --- .../assistant_schedule_references_put_test.go | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 internal/httpapi/assistant_schedule_references_put_test.go diff --git a/internal/httpapi/assistant_schedule_references_put_test.go b/internal/httpapi/assistant_schedule_references_put_test.go new file mode 100644 index 000000000..3b0949f6c --- /dev/null +++ b/internal/httpapi/assistant_schedule_references_put_test.go @@ -0,0 +1,66 @@ +package httpapi + +import ( + "context" + "net/http" + "strings" + "testing" + + "agentflow/internal/domain" +) + +func scheduledRefOwnerFixture(t *testing.T, login string) (*assistantHandlers, domain.User) { + t.Helper() + st := cvAStore(t) + if err := st.PutUser(domain.User{LoginName: login, CodeBuddyAPIKey: "secret"}); err != nil { + t.Fatal(err) + } + user, _ := st.UserByLoginName(login) + if err := st.PutProject(domain.Project{ID: "ref-put-home", Name: "Home", OwnerID: user.ID}); err != nil { + t.Fatal(err) + } + if err := st.PutIssue(domain.Issue{ID: "ref-put-issue", ProjectID: "ref-put-home", Title: "Home Issue"}); err != nil { + t.Fatal(err) + } + return &assistantHandlers{deps: &deps{repo: st}}, user +} + +func TestPutAssistantTaskStoresNormalizedReferences(t *testing.T) { + h, user := scheduledRefOwnerFixture(t, "ref-put-owner") + + c, rec := cvAContext(t, http.MethodPut, "/api/assistant/tasks", `{"id":"ref-job","name":"job","prompt":"do it","projectId":"ref-put-home","intervalSec":60,"references":[{"type":" issue ","id":"ref-put-issue","name":"forged","projectId":"elsewhere"},{"type":"issue","id":"ref-put-issue"}]}`, &user) + h.putTask(c) + if rec.Code != http.StatusOK { + t.Fatalf("put = %d %s", rec.Code, rec.Body.String()) + } + stored, err := loadAssistantTask(h.repo, user.ID, "ref-job") + if err != nil || len(stored.References) != 1 || stored.References[0] != (domain.AssistantReference{Type: "issue", ID: "ref-put-issue"}) { + t.Fatalf("stored references = %+v err=%v", stored.References, err) + } + + c, rec = cvAContext(t, http.MethodPut, "/api/assistant/tasks", `{"id":"ref-bad","name":"job","prompt":"do it","projectId":"ref-put-home","intervalSec":60,"references":[{"type":"element","id":"x"}]}`, &user) + h.putTask(c) + if rec.Code != http.StatusBadRequest || !strings.Contains(rec.Body.String(), "无效") { + t.Fatalf("invalid reference put = %d %s", rec.Code, rec.Body.String()) + } + if _, err := loadAssistantTask(h.repo, user.ID, "ref-bad"); err == nil { + t.Fatal("task with an invalid reference was saved") + } +} + +func TestScheduledTaskWithMissingReferenceFailsBeforeTurn(t *testing.T) { + h, user := scheduledRefOwnerFixture(t, "ref-put-runner") + called := false + h.generate = func(context.Context, string, domain.User) (string, error) { + called = true + return "", nil + } + task := assistantTask{ID: "ref-missing", Name: "巡检", Prompt: "检查", ProjectID: "ref-put-home", IntervalSec: 60, Enabled: true, + References: []domain.AssistantReference{{Type: "issue", ID: "deleted-issue"}}} + if err := h.executeAssistantTask(context.Background(), user, &task); err == nil { + t.Fatal("missing reference did not fail the run") + } + if called || task.LastStatus != "error" || !strings.Contains(task.LastError, "deleted-issue") || task.SessionID != "" { + t.Fatalf("task after failed run = %+v called=%v", task, called) + } +} From ab804f3a65142d08e10b82ebcf512f1cfc256cb8 Mon Sep 17 00:00:00 2001 From: shenchen Date: Fri, 20 Nov 2026 20:26:21 +0800 Subject: [PATCH 4/6] fix: keep scheduled issue references scoped to each execution --- internal/httpapi/assistant_workbench.go | 4 +- .../schedule_references_sessions_test.go | 44 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/internal/httpapi/assistant_workbench.go b/internal/httpapi/assistant_workbench.go index b43a48db1..63f34fd14 100644 --- a/internal/httpapi/assistant_workbench.go +++ b/internal/httpapi/assistant_workbench.go @@ -1342,7 +1342,9 @@ func (h *assistantHandlers) linkMentionedIssue(req *assistantRequest, user domai } ownerID := assistantStorageOwner(h.repo, req.SessionID, user.ID) session, ok := h.repo.AssistantSession(ownerID, req.SessionID) - if !ok || session.Shared || session.RunID != "" || session.IssueID != "" { + // Scheduled references belong to each execution and must not become a + // persistent issue binding when a fixed session is reused. + if !ok || session.Shared || session.Source == domain.AssistantSourceScheduled || session.RunID != "" || session.IssueID != "" { return "" } issueID := "" diff --git a/internal/httpapi/schedule_references_sessions_test.go b/internal/httpapi/schedule_references_sessions_test.go index f9afdbdc3..3a351323d 100644 --- a/internal/httpapi/schedule_references_sessions_test.go +++ b/internal/httpapi/schedule_references_sessions_test.go @@ -9,6 +9,50 @@ import ( "agentflow/internal/repo" ) +func TestScheduleFixedSessionContinuesAfterRemovingAndDeletingIssueReference(t *testing.T) { + stubCLIModelDiscovery(t) + discoverCLIModels = func(context.Context, string, string) []string { return []string{"glm-5.1"} } + h, user, job := scheduleSessionFixture(t) + job.SessionMode = domain.ScheduleSessionFixed + job.AssistantModel = "glm-5.1" + issue := domain.Issue{ID: "removed-session-reference", ProjectID: job.ProjectID, Title: "Referenced issue"} + if err := h.repo.PutIssue(issue); err != nil { + t.Fatal(err) + } + job.References = []domain.AssistantReference{{Type: "issue", ID: issue.ID}} + calls := 0 + h.generate = func(_ context.Context, prompt string, _ domain.User) (string, error) { + calls++ + if calls == 1 && !strings.Contains(prompt, issue.Title) { + t.Fatal("first execution did not resolve the issue reference") + } + if calls > 1 && strings.Contains(prompt, "当前会话关联的主需求(每轮从平台读取的最新数据)") { + t.Fatal("removed reference was injected as the session's linked issue") + } + return "done", nil + } + _, sessionID, err := h.runScheduleJobPrompt(job) + if err != nil || sessionID == "" { + t.Fatalf("first execution: session=%q err=%v", sessionID, err) + } + job.FixedSessionID = sessionID + job.References = nil + if err := h.repo.DeleteIssue(issue.ID); err != nil { + t.Fatal(err) + } + _, nextSessionID, err := h.runScheduleJobPrompt(job) + if err != nil || nextSessionID != sessionID { + t.Fatalf("execution after removing and deleting the reference: session=%q want=%q err=%v", nextSessionID, sessionID, err) + } + session, ok := h.repo.AssistantSession(user.ID, sessionID) + if !ok || session.IssueID != "" || len(session.Messages) != 4 || calls != 2 { + t.Fatalf("fixed session: found=%v issue=%q messages=%d calls=%d", ok, session.IssueID, len(session.Messages), calls) + } + if refs := session.Messages[2].References; len(refs) != 0 { + t.Fatalf("removed reference persisted in the new message: %+v", refs) + } +} + func TestScheduleReferencesWithSessionModesAndSharedKey(t *testing.T) { stubCLIModelDiscovery(t) discoverCLIModels = func(context.Context, string, string) []string { return []string{"glm-5.1"} } From 030435d0fca3514865bc0a5976de3112245dcc99 Mon Sep 17 00:00:00 2001 From: shenchen Date: Fri, 20 Nov 2026 21:06:39 +0800 Subject: [PATCH 5/6] test: initialize repository for conversation version diagnostics Use the existing workbench fixture so the conversation executor can load SSH host trust without dereferencing a nil repository. Keep the CLI version and source assertions intact. --- internal/httpapi/assistant_diagnostics_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/httpapi/assistant_diagnostics_test.go b/internal/httpapi/assistant_diagnostics_test.go index bb280d843..272845366 100644 --- a/internal/httpapi/assistant_diagnostics_test.go +++ b/internal/httpapi/assistant_diagnostics_test.go @@ -85,10 +85,10 @@ func TestAssistantDiagnosticsReceiveVersionFromConversationProcess(t *testing.T) d := newAssistantDiagnosticsCollector(g) ctx := context.WithValue(context.Background(), assistantDiagnosticsKey{}, d) root := t.TempDir() - h := &assistantHandlers{deps: &deps{}} - session := &AgentToolSession{ChatOwnerID: 1, ChatSessionID: "version-session", RuntimeMode: domain.AssistantModePlatform} + h, user := workbenchFixture(t) + session := &AgentToolSession{ChatOwnerID: user.ID, ChatSessionID: "version-session", RuntimeMode: domain.AssistantModePlatform} req := assistantCLIRequest{Prompt: "test", SessionRoot: root, Execute: h.conversationExecutor(session, root)} - if _, _, err := runAssistantCLI(ctx, req, domain.User{ID: 1, CodeBuddyAPIKey: "test-private-key"}, nil); err != nil { + if _, _, err := runAssistantCLI(ctx, req, user, nil); err != nil { t.Fatal(err) } g.Status = "completed" From 268b567b131c32a87f2d910643ed9042d54773b5 Mon Sep 17 00:00:00 2001 From: shenchen Date: Sat, 21 Nov 2026 13:54:46 +0800 Subject: [PATCH 6/6] feat(schedule): support project asset references and sharing --- chatbot/src/App.jsx | 208 ++------ chatbot/src/MentionPicker.jsx | 62 ++- chatbot/src/ReferenceInput.jsx | 171 +++++++ chatbot/src/prompt-editor-entry.jsx | 122 +++++ chatbot/src/prompt-editor.css | 92 ++++ chatbot/src/reference-input.css | 126 +++++ chatbot/src/styles.css | 126 +---- chatbot/tests/reference-input.test.jsx | 380 ++++++++++++++ chatbot/vite.config.js | 11 +- internal/domain/observability.go | 2 + internal/domain/shared_schedule.go | 48 +- internal/engine/node_execute.go | 19 + internal/engine/run_start.go | 24 + .../engine/shared_schedule_assets_test.go | 104 ++++ internal/httpapi/agent_tool_mcp.go | 3 + internal/httpapi/assistant_mcp.go | 16 +- internal/httpapi/assistant_schedule.go | 28 +- internal/httpapi/assistant_schedule_assets.go | 57 +++ .../httpapi/assistant_schedule_assets_test.go | 114 +++++ .../assistant_schedule_references_test.go | 55 ++ internal/httpapi/assistant_tasks.go | 2 +- internal/httpapi/assistant_workbench.go | 3 + internal/httpapi/catalog.go | 115 ++--- internal/httpapi/catalog_cases_test.go | 9 + internal/httpapi/catalog_shared_refs_test.go | 95 ++++ internal/httpapi/runs.go | 15 +- internal/httpapi/schedule.go | 2 +- .../schedule_references_sessions_test.go | 19 + internal/httpapi/schedule_test.go | 10 + internal/httpapi/shared_schedules.go | 19 +- internal/httpapi/shared_schedules_test.go | 24 +- internal/repo/catalog_sharing.go | 137 +++++ internal/repo/shared_schedule_assets.go | 127 +++++ internal/repo/shared_schedule_assets_test.go | 477 ++++++++++++++++++ internal/repo/shared_schedules.go | 27 + web/app/shared-schedules.js | 20 +- web/app/sync-schedule.js | 152 ++---- web/index.html | 23 +- web/schedule_dispatch_limit_test.go | 11 +- web/sync.css | 4 + webtest/tests/schedule-references.test.mjs | 124 +++-- 41 files changed, 2619 insertions(+), 564 deletions(-) create mode 100644 chatbot/src/ReferenceInput.jsx create mode 100644 chatbot/src/prompt-editor-entry.jsx create mode 100644 chatbot/src/prompt-editor.css create mode 100644 chatbot/src/reference-input.css create mode 100644 chatbot/tests/reference-input.test.jsx create mode 100644 internal/engine/shared_schedule_assets_test.go create mode 100644 internal/httpapi/assistant_schedule_assets.go create mode 100644 internal/httpapi/assistant_schedule_assets_test.go create mode 100644 internal/repo/catalog_sharing.go create mode 100644 internal/repo/shared_schedule_assets.go create mode 100644 internal/repo/shared_schedule_assets_test.go diff --git a/chatbot/src/App.jsx b/chatbot/src/App.jsx index c8872ce16..731be2b8f 100644 --- a/chatbot/src/App.jsx +++ b/chatbot/src/App.jsx @@ -54,10 +54,10 @@ import { credentialHint, openCredentialSettings } from "./credentials"; import { groupSessionHistory, scheduledSession, sessionProjectName } from "./session-history.js"; import { runSessionState, sessionReplyStatus, sessionTooltip, sidebarReplyStatus } from "./session-status.js"; import { unreadReply, useReadReplies } from "./session-unread.js"; -import MentionPicker from "./MentionPicker"; +import ReferenceInput from "./ReferenceInput"; import Participants, { Avatar, authorFor } from "./Participants"; import IssueContext from "./IssueContext"; -import { mentionAt, insertMention } from "./mentions.js"; +import { insertMention } from "./mentions.js"; import { elementTitle } from "./element-context.js"; import HarnessIcon from "./HarnessIcon"; import QueuedMessages from "./QueuedMessages"; @@ -365,9 +365,9 @@ export default function App() { chat.newChat(); } const input = useRef(), + referenceInput = useRef(), sessionPress = useRef(null), sessionClickSuppressed = useRef(null), - mentionPicker = useRef(), projectPicker = useRef(null), headerProjectPicker = useRef(null), fileInput = useRef(), @@ -666,9 +666,12 @@ export default function App() { setText(value.text); setReferences([ref]); setMention(null); + const editor = input.current; requestAnimationFrame(() => { - input.current?.focus(); - input.current?.setSelectionRange(value.caret, value.caret); + if (!editor?.isConnected || editor.value !== value.text) return; + if (document.activeElement !== document.body && document.activeElement !== editor) return; + editor.focus(); + editor.setSelectionRange(value.caret, value.caret); }); }) .catch((e) => current && chat.setError(e.message)) @@ -978,18 +981,6 @@ export default function App() { setUploading(false); } } - function openReferences() { - const caret = input.current?.selectionStart ?? text.length; - setMention( - mentionAt(text, caret, references) || { - start: caret, - end: caret, - query: "", - }, - ); - closeMenu(); - input.current?.focus(); - } // addElementReference takes an element picked in the native preview: it // rides along as a reference chip, without a token in the text. function addElementReference(ref) { @@ -1000,27 +991,6 @@ export default function App() { setReferences((old) => [...old, ref]); requestAnimationFrame(() => input.current?.focus()); } - function addReference(ref) { - if ( - references.length >= 12 && - !references.some((x) => x.type === ref.type && x.id === ref.id) - ) { - chat.setError("每轮最多引用 12 个对象。"); - return; - } - const value = insertMention(text, mention, ref); - setText(value.text); - setReferences((old) => - old.some((x) => x.type === ref.type && x.id === ref.id) - ? old - : [...old, ref], - ); - setMention(null); - requestAnimationFrame(() => { - input.current?.focus(); - input.current?.setSelectionRange(value.caret, value.caret); - }); - } const sidebarSections = splitSidebarSections(chat.sessions, chat.projects, { archived, mineOnly, @@ -1982,22 +1952,7 @@ export default function App() { onSendNow={chat.sendNow} />
- setMention(null)} - issueId={chat.issueId} - canManageIssue={!!chat.projectId && !chat.busy && (!chat.activeId || !!chat.session) && !chat.session?.shared && !chat.readOnly} - onManageIssue={() => { - setMention(null); - setIssueContextOpen(true); - }} - /> - {attachments.length || pendingAttachments.length || references.length ? ( + {attachments.length || pendingAttachments.length ? (
{pendingAttachments.map((a) => ( ); })} - {references.map((ref) => ( - - {ref.type === "element" ? ( - - ) : ( - "@" - )} - {ref.name || ref.id} - - - ))}
) : null} - + +

到点以与主页 AI 对话相同的完全权限执行提示词,可按需读写平台、启动 SOP、操作工作区及浏览器。

- @@ -1217,6 +1203,7 @@

触发配置

业务参数
+

diff --git a/web/schedule_dispatch_limit_test.go b/web/schedule_dispatch_limit_test.go index 96e912445..0dfb7c6cc 100644 --- a/web/schedule_dispatch_limit_test.go +++ b/web/schedule_dispatch_limit_test.go @@ -15,8 +15,8 @@ const assert = require('node:assert/strict'); const fs = require('node:fs'); const code = fs.readFileSync('app/sync-schedule.js', 'utf8'); const html = fs.readFileSync('index.html', 'utf8'); -assert.match(html, /id="scheduleAddReference"/); -assert.match(html, /id="scheduleReferenceOptions"/); +assert.match(html, /id="schedulePromptEditor"/); +assert.match(html, /data-schedule-reference-editor/); const input = html.match(/]*name="maxDispatch"[^>]*>/)[0]; assert.ok(input.includes('type="number"') && input.includes('min="1"') && input.includes('max="10"')); assert.ok(!input.includes('required'), 'dispatch limit must be optional'); @@ -34,9 +34,10 @@ global.renderScheduleJobs=()=>{}; global.api=async (path,options)=>{saved=JSON.parse(options.body); return {...saved,id:'job'}}; global.notificationPayload=()=>[]; global.scheduleNotificationBindings=[]; -global.scheduleReferences=[]; +global.scheduleAssistantReferences=[]; global.scheduleModalVersion=0; global.closeScheduleJobModal=()=>{}; +eval(code.slice(code.indexOf('function scheduleReferenceIdentity('),code.indexOf('function syncSchedulePromptEditor('))); eval(code.slice(code.indexOf('async function saveScheduleJob('),code.indexOf('function scheduleJobOutcomeToast('))); async function submit(value) { saved=undefined; error=undefined; form.elements.maxDispatch.value=value; @@ -56,9 +57,9 @@ async function submit(value) { form.elements.jobKind.value='assistant'; form.elements.assistantPrompt.value='report'; assert.ok(!Object.hasOwn(await submit('3'),'maxDispatch'), 'AI jobs must not include the dispatch limit'); - global.scheduleReferences=[{type:'issue',id:'i1',name:'需求'}]; + global.scheduleAssistantReferences=[{type:'skill',id:'s1',name:'技能'}]; const aiPayload=await submit(''); - assert.deepEqual(aiPayload.references,[{type:'issue',id:'i1'}]); + assert.deepEqual(aiPayload.references,[{type:'skill',id:'s1'}]); })().catch(error=>{console.error(error);process.exit(1)}); ` if out, err := exec.Command(node, "-e", script).CombinedOutput(); err != nil { diff --git a/web/sync.css b/web/sync.css index fdf144b10..9cb78aace 100644 --- a/web/sync.css +++ b/web/sync.css @@ -140,6 +140,10 @@ @media(max-width:900px){.align-conflict-sides{grid-template-columns:1fr}} @media(max-width:700px){.schedule-job-row{align-items:flex-start;flex-wrap:wrap}.schedule-job-main{flex-basis:100%}} +/* AI 定时任务:提示词与项目资产共用主页的编辑器。 */ +[data-schedule-reference-editor] { grid-column:1 / -1; min-width:0; } +#schedulePromptEditor { min-width:0; } + /* AI 定时任务:业务导航页与触发配置共用编辑器。 */ #aiSchedulesView { color:var(--hui-text); } #aiSchedulesView .page-heading { display:flex;justify-content:space-between;align-items:center;gap:20px;margin-bottom:22px; } diff --git a/webtest/tests/schedule-references.test.mjs b/webtest/tests/schedule-references.test.mjs index 88608557f..1a7dbeb81 100644 --- a/webtest/tests/schedule-references.test.mjs +++ b/webtest/tests/schedule-references.test.mjs @@ -2,61 +2,87 @@ import test from 'node:test'; import assert from 'node:assert/strict'; import { loadApp, settle } from '../lib/load-app.mjs'; -test('asset references save alongside session settings without enabling a paused AI job', async (t) => { +function installPromptEditor(app) { + let options; + app.window.LoopForgePromptEditor = { + mount(_host, input) { + options = input; + return { + setValue(next) { options.value = next; }, + destroy() {}, + }; + }, + }; + return () => options; +} + +test('asset references use the shared prompt editor and save with session settings', async (t) => { const app = await loadApp(); t.after(app.close); + const getEditor = installPromptEditor(app); app.router.put('/api/schedule-jobs', call => ({ ...call.body })); - let jobs = []; - app.router.get('/api/schedule-jobs', () => jobs); - const reference = { type: 'issue', id: 'issue-1', name: 'Current title', projectId: 'project-1' }; - for (const sessionMode of ['', 'fixed']) { - const job = { id: 'referenced-job', projectId: 'project-1', name: 'Inspect', skipDispatch: true, - assistantPrompt: 'Inspect the asset', enabled: false, intervalSec: 3600, - sessionMode, sessionKeep: -1, references: [reference] }; - jobs = [job]; - await app.evaluate(`openScheduleJobModal('assistant',${JSON.stringify(job)})`); - const form = app.document.querySelector('#scheduleJobForm'); - assert.match(app.document.querySelector('#scheduleReferenceList').textContent, /Current title/); - form.dispatchEvent(new app.window.Event('submit', { bubbles: true, cancelable: true })); - await settle(4); - const save = app.router.calls.filter(call => call.method === 'PUT' && call.path === '/api/schedule-jobs').at(-1); - assert.deepEqual(save.body.references, [{ type: 'issue', id: 'issue-1' }]); - assert.equal(save.body.sessionMode, sessionMode); - assert.equal(save.body.sessionKeep, -1); - assert.equal(save.body.enabled, false); - } + const reference = { type: 'skill', id: 'skill-1', name: 'Current title', projectId: 'project-1' }; + const job = { id: 'referenced-job', projectId: 'project-1', name: 'Inspect', skipDispatch: true, + assistantPrompt: 'Inspect the asset', enabled: false, intervalSec: 3600, + sessionMode: 'fixed', sessionKeep: -1, references: [reference] }; + app.router.get('/api/schedule-jobs', () => [job]); + await app.evaluate(`openScheduleJobModal('assistant',${JSON.stringify(job)})`); + const form = app.document.querySelector('#scheduleJobForm'); + assert.equal(form.querySelector('[data-schedule-reference-editor]').hidden, false); + assert.equal(form.querySelector('[data-schedule-prompt]').hidden, true); + assert.equal(getEditor().value.text, 'Inspect the asset'); + assert.deepEqual(getEditor().value.references, [reference]); + getEditor().onChange({ text: 'Inspect @Current title ', references: [reference] }); + form.dispatchEvent(new app.window.Event('submit', { bubbles: true, cancelable: true })); + await settle(4); + const save = app.router.calls.filter(call => call.method === 'PUT' && call.path === '/api/schedule-jobs').at(-1); + assert.equal(save.body.assistantPrompt, 'Inspect @Current title'); + assert.deepEqual(save.body.references, [{ type: 'skill', id: 'skill-1' }]); + assert.equal(save.body.sessionMode, 'fixed'); + assert.equal(save.body.sessionKeep, -1); + assert.equal(save.body.enabled, false); }); -test('Escape closes the asset picker first and preserves the schedule draft and focus', async (t) => { +test('reopening an AI task resets the shared prompt editor draft', async (t) => { const app = await loadApp(); t.after(app.close); - app.router.get('/api/assistant/references', { items: [{ type: 'issue', id: 'issue-1', name: 'Current title' }] }); + const getEditor = installPromptEditor(app); + const first = { id: 'first', projectId: 'project-1', name: 'First', skipDispatch: true, + assistantPrompt: 'first prompt', references: [{ type: 'skill', id: 'skill-1', name: 'Testing' }] }; + await app.evaluate(`openScheduleJobModal('assistant',${JSON.stringify(first)})`); + assert.equal(getEditor().value.text, 'first prompt'); + const second = { id: 'second', projectId: 'project-1', name: 'Second', skipDispatch: true, + assistantPrompt: 'second prompt', references: [] }; + await app.evaluate(`openScheduleJobModal('assistant',${JSON.stringify(second)})`); + assert.equal(getEditor().value.text, 'second prompt'); + assert.deepEqual(getEditor().value.references, []); +}); + +test('subscription references follow the pinned version and cannot retain a local draft', async (t) => { + const app = await loadApp(); + t.after(app.close); + const getEditor = installPromptEditor(app); + const first = { type: 'skill', id: 'published-skill', name: 'Published skill' }; + const second = { type: 'agent', id: 'published-role', name: 'Published role' }; + const v1 = { id: 'shared-ref', version: 1, name: 'Shared', sourceProjectId: 'source', prompt: 'Version one', references: [first], parameters: [] }; + const v2 = { ...v1, version: 2, prompt: 'Version two', references: [second] }; + app.router.get('/api/shared-schedule-tasks/shared-ref/versions', () => [v2, v1]); + const job = { id: 'sub', projectId: 'project-1', name: 'Subscription', skipDispatch: true, + sharedTaskId: v1.id, sharedTaskVersion: 1, references: [{ type: 'issue', id: 'forged-local' }] }; + await app.evaluate(`openScheduleJobModal('assistant',${JSON.stringify(job)})`); + assert.equal(getEditor().value.readOnly, true); + assert.equal(getEditor().value.text, v1.prompt); + assert.deepEqual(getEditor().value.references, [first]); + await app.evaluate("openSharedScheduleVersions('shared-ref',true)"); + assert.equal(getEditor().value.text, v2.prompt); + assert.deepEqual(getEditor().value.references, [second]); + const selector = app.document.querySelector('#sharedScheduleVersionEditor select'); + selector.value = '1'; + selector.dispatchEvent(new app.window.Event('change', { bubbles: true })); + assert.deepEqual(getEditor().value.references, [first]); await app.evaluate("openScheduleJobModal('assistant')"); - const form = app.document.querySelector('#scheduleJobForm'); - const modal = app.document.querySelector('#scheduleModal'); - const add = app.document.querySelector('#scheduleAddReference'); - const picker = app.document.querySelector('#scheduleReferencePicker'); - const query = app.document.querySelector('#scheduleReferenceQuery'); - form.elements.assistantPrompt.value = 'Unsaved schedule draft'; - const escape = target => target.dispatchEvent(new app.window.KeyboardEvent('keydown', { key: 'Escape', bubbles: true, cancelable: true })); - for (const target of ['query', 'option', 'selection']) { - add.click(); - await settle(4); - const option = app.document.querySelector('[data-schedule-reference]'); - assert.ok(option); - if (target === 'option') option.focus(); - if (target === 'selection') { - option.click(); - await settle(4); - assert.equal(app.document.activeElement, query, 'selection restores search focus'); - } - escape(app.document.activeElement); - assert.equal(picker.hidden, true); - assert.equal(add.getAttribute('aria-expanded'), 'false'); - assert.equal(app.document.activeElement, add); - assert.equal(modal.classList.contains('open'), true); - assert.equal(form.elements.assistantPrompt.value, 'Unsaved schedule draft'); - } - escape(add); - assert.equal(modal.classList.contains('open'), false, 'Escape still closes the editor when the picker is hidden'); + assert.equal(getEditor().value.readOnly, false); + assert.deepEqual(getEditor().value.references, []); + await app.evaluate(`sharedScheduleRowInfo(${JSON.stringify(job)});syncSchedulePromptEditor()`); + assert.deepEqual(getEditor().value.references, []); });