diff --git a/chatbot/src/App.jsx b/chatbot/src/App.jsx index 1d76e410..ac606c2f 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(), @@ -667,11 +667,13 @@ export default function App() { setText(value.text); setReferences([ref]); setMention(null); + const editor = input.current; requestAnimationFrame(() => { // Preserve the user’s focus if they interacted during the handoff. - if (draftReady.current !== draftKey || document.activeElement !== focusBeforeHandoff) return; - input.current?.focus(); - input.current?.setSelectionRange(value.caret, value.caret); + if (draftReady.current !== draftKey || !editor?.isConnected || editor.value !== value.text) return; + if (document.activeElement !== focusBeforeHandoff) return; + editor.focus(); + editor.setSelectionRange(value.caret, value.caret); }); }) .catch((e) => current && chat.setError(e.message)) @@ -981,18 +983,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) { @@ -1003,27 +993,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, @@ -1985,22 +1954,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、操作工作区及浏览器。

+
@@ -1200,6 +1203,7 @@

触发配置

业务参数
+

diff --git a/web/schedule_dispatch_limit_test.go b/web/schedule_dispatch_limit_test.go index 4c17c775..0dfb7c6c 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="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'); @@ -32,8 +34,10 @@ global.renderScheduleJobs=()=>{}; global.api=async (path,options)=>{saved=JSON.parse(options.body); return {...saved,id:'job'}}; global.notificationPayload=()=>[]; global.scheduleNotificationBindings=[]; +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; @@ -53,6 +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.scheduleAssistantReferences=[{type:'skill',id:'s1',name:'技能'}]; + const aiPayload=await submit(''); + 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 7c004b12..9cb78aac 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} @@ -130,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 new file mode 100644 index 00000000..1a7dbeb8 --- /dev/null +++ b/webtest/tests/schedule-references.test.mjs @@ -0,0 +1,88 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { loadApp, settle } from '../lib/load-app.mjs'; + +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 })); + 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('reopening an AI task resets the shared prompt editor draft', async (t) => { + const app = await loadApp(); + t.after(app.close); + 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')"); + assert.equal(getEditor().value.readOnly, false); + assert.deepEqual(getEditor().value.references, []); + await app.evaluate(`sharedScheduleRowInfo(${JSON.stringify(job)});syncSchedulePromptEditor()`); + assert.deepEqual(getEditor().value.references, []); +});