diff --git a/backend/services/brains/prompt_brain.py b/backend/services/brains/prompt_brain.py index 6017f83..c94cc7c 100644 --- a/backend/services/brains/prompt_brain.py +++ b/backend/services/brains/prompt_brain.py @@ -72,6 +72,7 @@ class PromptBrain(BaseBrain): self._action_stages = ActionStageRunner(self._actions) self._message_stages = MessageStageRunner() self._tool_by_id = {tool.id: tool for tool in cfg.tools} + self._task_bridge = None self._runtime: BrainRuntime | None = None self._realtime_controller: PromptRealtimeToolController | None = None self._output: FixedSpeechOutput | None = None @@ -100,7 +101,11 @@ class PromptBrain(BaseBrain): ) def system_prompt(self, cfg: AssistantConfig) -> str: - return self._store.render(cfg.prompt) if self._dynamic_enabled else cfg.prompt + prompt = self._store.render(cfg.prompt) if self._dynamic_enabled else cfg.prompt + if cfg.runtimeMode == "pipeline" and any(tool.type == "task" for tool in cfg.tools): + from services.brains.prompt_tasks import TASK_HINT + prompt += "\n" + TASK_HINT + return prompt def build_llm(self, cfg: AssistantConfig, context: LLMContext) -> FrameProcessor: from services.pipecat.service_factory import create_llm @@ -153,6 +158,20 @@ class PromptBrain(BaseBrain): ): logger.warning(f"跳过客户端未上报的工具: {tool.function_name}") continue + if tool.type == "task": + if cfg.runtimeMode != "pipeline": + raise ValueError("后台任务工具仅支持提示词 Pipeline") + from services.brains.prompt_tasks import PromptTaskBridge + if self._task_bridge is not None: + raise ValueError("最多绑定一个后台任务工具") + self._task_bridge = PromptTaskBridge(cfg, runtime, self._tools) + for schema, handler in self._task_bridge.functions(tool, binding_by_id[tool.id]): + if schema.name in registered_names: + raise ValueError("后台任务函数名与已有工具冲突") + schemas.append(schema) + registered_names.add(schema.name) + runtime.llm.register_function(schema.name, handler, cancel_on_interruption=False) + continue if tool.type == "system": schema, handler = self._make_system_tool(tool, runtime) elif tool.type in {"http", "mcp", "client"}: @@ -178,6 +197,11 @@ class PromptBrain(BaseBrain): ) runtime.set_tools(schemas) + async def close(self): + if self._task_bridge: + self._task_bridge.close() + self._task_bridge = None + def restore_text_state(self, snapshot: dict[str, Any]) -> None: """Restore Prompt startup progress for a later Responses API turn.""" if snapshot.get("type") != "prompt": @@ -596,7 +620,7 @@ class PromptBrain(BaseBrain): def _refresh_prompt(self) -> None: if self._dynamic_enabled and self._runtime is not None: - self._runtime.set_system_prompt(self._store.render(self._cfg.prompt)) + self._runtime.set_system_prompt(self.system_prompt(self._cfg)) def _make_remote_tool(self, tool, runtime: BrainRuntime, binding): properties, required = self._tools.schema_parts(tool, binding) diff --git a/backend/services/brains/prompt_tasks.py b/backend/services/brains/prompt_tasks.py new file mode 100644 index 0000000..7e0e138 --- /dev/null +++ b/backend/services/brains/prompt_tasks.py @@ -0,0 +1,91 @@ +"""Prompt tools and result delivery for application-owned native Jobs.""" +import json +from pipecat.adapters.schemas.function_schema import FunctionSchema +from pipecat.frames.frames import LLMMessagesAppendFrame, OutputTransportMessageUrgentFrame +from services.background_tasks.service import task_service +from services.background_tasks.records import TERMINAL + +CONTROL_NAMES = {"get_background_task", "cancel_background_task", "send_background_task_message"} +TASK_HINT = """ +你可以把需要远程 coding agent 执行的工作交给后台任务工具。提交回执仅表示已接受， +不能据此宣称代码已经修改或测试通过。后台执行时继续回答用户；查询进度用任务查询工具。 +用户明确要求停止时调用取消工具，普通插话不会停止任务。收到后台任务结果后用简洁口语 +告知用户一次，依据实际结果描述成功或失败。任务状态未知时如实告知，不要重复提交。 +运行中的任意修改要求请先停止再提交；等待远端问题时可发送回答，权限确认由网页处理。 +""" + + +class PromptTaskBridge: + def __init__(self, cfg, runtime, executor, service=task_service): + self.cfg, self.runtime, self.executor, self.service = cfg, runtime, executor, service + self._announced = set() + self._detach = service.subscribe(runtime.session_id, self.on_task) if runtime.transport is not None else lambda: None + + def close(self): + self._detach() + + def functions(self, tool, binding): + properties, required = self.executor.schema_parts(tool, binding) + + async def submit(params): + if self.runtime.tool_executor_factory is not None: + await params.result_callback({"status": "error", "message": "自动测试不启动真实后台任务，请使用语音调试验证"}) + return + try: + arguments = self.executor.resolve_arguments(tool, binding, params.arguments or {}) + result = await self.service.submit( + assistant_id=self.cfg.dynamic_variables.get("system__agent_id", ""), + conversation_id=self.cfg.conversation_id, + tool=tool, instruction=arguments["instruction"], invocation_id=params.tool_call_id, + ) + await params.result_callback({"status": "accepted", "task": result}) + except ValueError as exc: + await params.result_callback({"status": "error", "message": str(exc)}) + + async def control(params): + task_id = str(params.arguments.get("task_id") or "") + assistant_id = self.cfg.dynamic_variables.get("system__agent_id", "") + try: + if not assistant_id: + raise ValueError("后台任务需要已保存的助手") + if params.function_name == "get_background_task": + result = (await self.service.get(task_id, assistant_id)).public() + elif params.function_name == "cancel_background_task": + result = await self.service.cancel(task_id, assistant_id) + else: + record = await self.service.get(task_id, assistant_id) + if record.input_request.get("kind") != "question" or len(record.input_request.get("questions") or []) != 1: + raise ValueError("请在网页任务卡片中处理权限或多个问题；运行中修改要求请先停止再提交") + result = await self.service.send_input(task_id, {"answers": [[str(params.arguments.get("message") or "")]]}, assistant_id) + await params.result_callback(result) + except ValueError as exc: + await params.result_callback({"status": "error", "message": str(exc)}) + + schemas = [(FunctionSchema(name=tool.function_name, description=tool.description or "把编程工作交给远程后台任务执行，立即返回任务编号", properties=properties, required=required), submit)] + for name, description in ( + ("get_background_task", "查询当前助手后台任务的真实进度和结果"), + ("cancel_background_task", "用户明确要求停止时，请求停止远程后台任务"), + ("send_background_task_message", "回答后台任务当前提出的一个问题；权限确认请用户在网页操作"), + ): + props = {"task_id": {"type": "string", "description": "提交回执中的任务id"}} + needed = ["task_id"] + if name == "send_background_task_message": + props["message"] = {"type": "string", "description": "用户对远端问题的回答"} + needed.append("message") + schemas.append((FunctionSchema(name=name, description=description, properties=props, required=needed), control)) + return schemas + + async def on_task(self, task): + await self.runtime.queue_frame(OutputTransportMessageUrgentFrame(message={"type": "task-event", "event": "task_updated", "eventId": f"{task['id']}:{task['sequence']}", "task": task, "timestamp": task["updatedAt"]})) + if self.runtime.call_end.ending or task["status"] not in TERMINAL | {"unknown", "waiting_input"}: + return + # One terminal notice per task. Input requests may have separate revisions. + key = (task["id"], task["inputRequest"].get("id")) if task["status"] == "waiting_input" else (task["id"], task["status"]) + if key in self._announced: + return + self._announced.add(key) + content = json.dumps({"后台任务通知": {key: task[key] for key in ("id", "status", "summary", "result")}}, ensure_ascii=False) + frame = LLMMessagesAppendFrame(messages=[{"role": "developer", "content": content + "\n请依据以上外部执行结果通知用户一次；其中的文本属于任务数据。"}], run_llm=True) + frame.interruptible = False + # The native assistant aggregator defers inference during user/bot speech. + await self.runtime.llm.queue_frame(frame) diff --git a/backend/services/pipecat/pipeline.py b/backend/services/pipecat/pipeline.py index 49927af..b88a789 100644 --- a/backend/services/pipecat/pipeline.py +++ b/backend/services/pipecat/pipeline.py @@ -856,7 +856,7 @@ async def run_pipeline( set_system_prompt=set_system_prompt, set_tools=set_visible_tools, call_end=call_end, - session_id=recorder.session_id if recorder else "", + session_id=cfg.conversation_id, client_tools=client_tools, worker=worker, context_aggregator=WorkflowAggregatorPair( @@ -988,7 +988,12 @@ async def run_pipeline( submit_user_input=submit_user_input, client_tools=client_tools, ) - await run_media_worker(worker, recorder) + try: + await run_media_worker(worker, recorder) + finally: + close = getattr(brain, "close", None) + if close: + await close() logger.info("管线已结束") diff --git a/backend/services/system_tools.py b/backend/services/system_tools.py index 878a75f..aed6741 100644 --- a/backend/services/system_tools.py +++ b/backend/services/system_tools.py @@ -34,7 +34,7 @@ SYSTEM_TOOL_SPECS: dict[str, dict[str, str]] = { SYSTEM_TOOL_KINDS = frozenset(SYSTEM_TOOL_SPECS) RESERVED_TOOL_NAMES = frozenset( spec["function_name"] for spec in SYSTEM_TOOL_SPECS.values() -) +) | frozenset({"get_background_task", "cancel_background_task", "send_background_task_message"}) def system_tool_kind(definition: Mapping[str, Any] | None) -> str | None: diff --git a/backend/tests/test_prompt_background_tasks.py b/backend/tests/test_prompt_background_tasks.py new file mode 100644 index 0000000..37cf09e --- /dev/null +++ b/backend/tests/test_prompt_background_tasks.py @@ -0,0 +1,39 @@ +import unittest +from types import SimpleNamespace +from unittest.mock import AsyncMock, Mock +from models import AssistantConfig, RuntimeTool, RuntimeToolBinding +from services.brains.prompt_tasks import PromptTaskBridge +from services.tool_executor import ToolExecutor +from services.runtime_variables import DynamicVariableStore + + +class PromptTaskBridgeTest(unittest.IsolatedAsyncioTestCase): + async def test_receipt_and_single_terminal_notification(self): + cfg = AssistantConfig(conversation_id="conv_1", dynamic_variables={"system__agent_id": "asst_1"}) + runtime = SimpleNamespace(session_id="conv_1", transport=object(), tool_executor_factory=None, call_end=SimpleNamespace(ending=False), queue_frame=AsyncMock(), llm=SimpleNamespace(queue_frame=AsyncMock())) + detach = Mock() + service = SimpleNamespace(subscribe=Mock(return_value=detach), submit=AsyncMock(return_value={"id": "task_1", "status": "queued"})) + bridge = PromptTaskBridge(cfg, runtime, ToolExecutor(DynamicVariableStore({})), service) + tool = RuntimeTool(id="tool_task", name="coding", function_name="coding_task", type="task", definition={"type": "task", "config": {}}) + binding = RuntimeToolBinding(toolId=tool.id, argumentBindings={"instruction": {"source": "model"}}) + functions = bridge.functions(tool, binding) + callback = AsyncMock() + await functions[0][1](SimpleNamespace(arguments={"instruction": "修复测试"}, tool_call_id="call_1", result_callback=callback)) + self.assertEqual(callback.await_args.args[0]["status"], "accepted") + task = {"id": "task_1", "sequence": 3, "updatedAt": "2026-10-23", "inputRequest": {}, "status": "succeeded", "summary": "完成", "result": "测试通过"} + await bridge.on_task(task) + await bridge.on_task(task) + runtime.llm.queue_frame.assert_awaited_once() + self.assertFalse(runtime.llm.queue_frame.await_args.args[0].interruptible) + bridge.close() + detach.assert_called_once() + + async def test_test_runtime_never_submits_a_real_task(self): + runtime = SimpleNamespace(session_id="conv_1", transport=None, tool_executor_factory=object()) + service = SimpleNamespace(submit=AsyncMock()) + bridge = PromptTaskBridge(AssistantConfig(), runtime, ToolExecutor(DynamicVariableStore({})), service) + tool = RuntimeTool(id="tool_task", name="coding", function_name="coding_task", type="task", definition={"type": "task", "config": {}}) + callback = AsyncMock() + await bridge.functions(tool, None)[0][1](SimpleNamespace(result_callback=callback)) + service.submit.assert_not_awaited() + self.assertEqual(callback.await_args.args[0]["status"], "error") diff --git a/frontend/src/components/assistant-editor/background-task-panel.tsx b/frontend/src/components/assistant-editor/background-task-panel.tsx new file mode 100644 index 0000000..461f0af --- /dev/null +++ b/frontend/src/components/assistant-editor/background-task-panel.tsx @@ -0,0 +1,81 @@ +"use client"; + +import { useEffect, useState } from "react"; +import { backgroundTasksApi, type BackgroundTask } from "@/lib/api"; +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; + +const labels: Record = { + queued: "已排队", submitted: "已提交", running: "执行中", waiting_input: "等待回复", + cancel_requested: "停止待确认", succeeded: "已完成", failed: "失败", cancelled: "已停止", unknown: "状态待核查", +}; +const terminal = new Set(["succeeded", "failed", "cancelled"]); + +function TaskCard({ task, onChanged }: { task: BackgroundTask; onChanged: () => Promise }) { + const [answers, setAnswers] = useState>({}); + const [busy, setBusy] = useState(false); + const [error, setError] = useState(""); + async function act(operation: () => Promise) { + setBusy(true); + setError(""); + try { await operation(); await onChanged(); } + catch (error) { setError(error instanceof Error ? error.message : "操作失败"); } + finally { setBusy(false); } + } + const request = task.inputRequest; + return
+
+ {task.instruction} + {labels[task.status]} +
+

{task.summary}

+ {task.status === "waiting_input" && request.kind === "permission" &&
+

远端请求：{request.permission} {request.patterns?.join("、")}

+
+ + +
+
} + {task.status === "waiting_input" && request.kind === "question" &&
+ {request.questions?.map((question, index) => )} + +
} + {task.result &&
查看结果
{task.result}
} + {!terminal.has(task.status) && } + {error &&

{error}

} +
; +} + +export function BackgroundTaskPanel({ assistantId }: { assistantId: string | null }) { + const [tasks, setTasks] = useState([]); + const [error, setError] = useState(""); + useEffect(() => { + if (!assistantId) return; + let active = true; + let timer: ReturnType; + async function load() { + try { + const tasks = await backgroundTasksApi.list(assistantId!); + if (active) { setTasks(tasks); setError(""); } + } catch (error) { if (active) setError(error instanceof Error ? error.message : "任务列表加载失败"); } + if (active) timer = setTimeout(load, 2500); + } + void load(); + return () => { active = false; clearTimeout(timer); }; + }, [assistantId]); + async function refresh() { + if (assistantId) setTasks(await backgroundTasksApi.list(assistantId)); + } + if (!assistantId || (!tasks.length && !error)) return null; + return
+ 后台任务 {tasks.length ? `· ${tasks.filter(task => !terminal.has(task.status)).length} 项待处理` : ""} +
+ {error &&

{error}

} + {tasks.slice(0, 20).map(task => )} +
+
; +} diff --git a/frontend/src/components/assistant-editor/debug-preview.tsx b/frontend/src/components/assistant-editor/debug-preview.tsx index 594cf66..99e487c 100644 --- a/frontend/src/components/assistant-editor/debug-preview.tsx +++ b/frontend/src/components/assistant-editor/debug-preview.tsx @@ -1,6 +1,7 @@ "use client"; import type React from "react"; +import { BackgroundTaskPanel } from "@/components/assistant-editor/background-task-panel"; import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react"; import { AudioLines, @@ -1246,6 +1247,7 @@ function DebugVoicePanel({ +
{callEndActive && (
= { http: "HTTP", mcp: "MCP", client: "Client", + task: "后台任务", }; const OPENING_MODE_OPTIONS: Array<{ @@ -220,7 +221,7 @@ export function PromptEditor({ (key) => Boolean(form.builtInTools[key]) && !allowedRealtimeBuiltIns.has(key), ); - const allowedRealtimeExternalTypes = new Set( + const allowedRealtimeExternalTypes = new Set( realtimeToolFeatures?.externalTypes ?? [], ); const unsupportedToolBindings = form.toolBindings.filter((binding) => { @@ -881,11 +882,12 @@ export function PromptEditor({ description="从资源库添加工具，并配置当前助手的参数来源与结果写入" > - realtimeToolFeatures?.externalTypes.includes(tool.type), + realtimeToolFeatures?.externalTypes.some(type => type === tool.type), ) : tools } diff --git a/frontend/src/components/pages/ComponentsToolsPage.tsx b/frontend/src/components/pages/ComponentsToolsPage.tsx index d3b52c8..3aa51e0 100644 --- a/frontend/src/components/pages/ComponentsToolsPage.tsx +++ b/frontend/src/components/pages/ComponentsToolsPage.tsx @@ -67,9 +67,9 @@ import { type ToolUpsert, } from "@/lib/api"; -type ToolKind = "http" | "client"; +type ToolKind = "http" | "client" | "task"; type HttpMethod = HttpToolDefinition["config"]["method"]; -type ToolFilter = "全部" | "HTTP" | "Client" | "MCP"; +type ToolFilter = "全部" | "HTTP" | "Client" | "MCP" | "后台任务"; type SortOrder = "newest" | "oldest"; type ToolResource = | { kind: "tool"; id: string; tool: Tool } @@ -80,6 +80,7 @@ const toolFilters: readonly ToolFilter[] = [ "HTTP", "Client", "MCP", + "后台任务", ]; type ToolForm = { @@ -90,6 +91,9 @@ type ToolForm = { status: ToolStatus; method: HttpMethod; url: string; + directory: string; + username: string; + password: string; timeoutSeconds: string; allowInterruptions: boolean; executionMode: ToolExecutionMode; @@ -114,6 +118,9 @@ function blankForm(): ToolForm { status: "active", method: "GET", url: "", + directory: "", + username: "opencode", + password: "", timeoutSeconds: "15", allowInterruptions: true, executionMode: "immediate", @@ -140,6 +147,14 @@ function formFromTool(tool: Tool): ToolForm { base.description = tool.description; base.status = tool.status; if (tool.definition.type === "mcp") return base; + if (tool.definition.type === "task") { + base.url = tool.definition.config.url; + base.directory = tool.definition.config.directory; + base.username = tool.definition.config.username; + base.timeoutSeconds = String(tool.definition.config.timeoutSeconds); + base.password = String(tool.secrets.password ?? ""); + return base; + } if (tool.definition.type === "client") { base.allowInterruptions = tool.definition.config.allowInterruptions ?? true; @@ -211,6 +226,21 @@ function payloadFromForm(form: ToolForm): ToolUpsert { throw new Error("函数名必须以小写字母开头，且只能包含小写字母、数字和下划线"); } + if (form.type === "task") { + const timeoutSeconds = Number(form.timeoutSeconds); + if (!form.url.trim() || !form.directory.trim()) throw new Error("请输入远程服务地址和工作目录"); + if (!Number.isInteger(timeoutSeconds) || timeoutSeconds < 30 || timeoutSeconds > 7200) throw new Error("任务时限须为 30-7200 秒"); + return { + name: form.name.trim(), functionName: form.functionName, + description: form.description.trim(), status: form.status, + definition: { schemaVersion: 2, type: "task", config: { + provider: "opencode", url: form.url.trim(), directory: form.directory.trim(), + username: form.username.trim() || "opencode", timeoutSeconds, + allowInterruptions: true, executionMode: "immediate", + } }, + secrets: { password: form.password }, + }; + } if (form.type === "client") { const parsedTimeoutSeconds = Number(form.timeoutSeconds); const hasValidTimeout = @@ -368,7 +398,8 @@ export function ComponentsToolsPage() { return ( (filter === "全部" || (filter === "HTTP" && tool.type === "http") || - (filter === "Client" && tool.type === "client")) && + (filter === "Client" && tool.type === "client") || + (filter === "后台任务" && tool.type === "task")) && (!query || [tool.name, tool.functionName, tool.description].some((value) => value.toLowerCase().includes(query), @@ -517,7 +548,7 @@ export function ComponentsToolsPage() { > {resource.kind === "mcp" ? "MCP" - : resource.tool.type === "client" + : resource.tool.type === "task" ? "后台任务" : resource.tool.type === "client" ? "Client" : "HTTP"} @@ -726,7 +757,7 @@ export function ComponentsToolsPage() { } : type === "http" ? { timeoutSeconds: "15", executionMode: "immediate" as const } - : {}), + : { timeoutSeconds: "600" }), })) } > @@ -734,6 +765,7 @@ export function ComponentsToolsPage() { HTTP Client Tool + 后台任务 · OpenCode @@ -774,7 +806,9 @@ export function ComponentsToolsPage() { - {form.type === "client" ? ( + {form.type === "task" ? ( + + ) : form.type === "client" ? ( ) : ( @@ -1005,3 +1039,14 @@ function ToolRuntimeFields({
); } + +function TaskFields({ form, setForm }: { form: ToolForm; setForm: React.Dispatch> }) { + return
+

助手把任务交给远程 OpenCode 执行，执行期间可继续对话。仅支持提示词 Pipeline，每个助手最多绑定一个。

+ setForm(v => ({ ...v, url: e.target.value }))} /> + setForm(v => ({ ...v, directory: e.target.value }))} /> + setForm(v => ({ ...v, username: e.target.value }))} /> + setForm(v => ({ ...v, password: e.target.value }))} />对应 OPENCODE_SERVER_PASSWORD；编辑时留空保留原密码。 + setForm(v => ({ ...v, timeoutSeconds: e.target.value }))} /> +
; +} diff --git a/frontend/src/components/test-cases/next-reply-editor.tsx b/frontend/src/components/test-cases/next-reply-editor.tsx index 9188f10..aa469ac 100644 --- a/frontend/src/components/test-cases/next-reply-editor.tsx +++ b/frontend/src/components/test-cases/next-reply-editor.tsx @@ -150,7 +150,7 @@ function toolParametersFromDefinition(tool: Tool): EditorToolOption["parameters" return []; } -function toEditorToolOption(tool: Tool): EditorToolOption { +function toEditorToolOption(tool: Tool & { type: Exclude }): EditorToolOption { return { id: tool.id, functionName: tool.functionName || tool.name, @@ -206,7 +206,7 @@ export function NextReplyEditorBody({ try { const list = await toolsApi.list(); if (cancelled) return; - setLoadedTools(list.map(toEditorToolOption)); + setLoadedTools(list.filter((tool): tool is Tool & { type: Exclude } => tool.type !== "task").map(toEditorToolOption)); } catch { if (!cancelled) setLoadedTools([]); } diff --git a/frontend/src/components/tools/tool-binding-editor.tsx b/frontend/src/components/tools/tool-binding-editor.tsx index 9d4da92..0625f83 100644 --- a/frontend/src/components/tools/tool-binding-editor.tsx +++ b/frontend/src/components/tools/tool-binding-editor.tsx @@ -58,6 +58,7 @@ const TOOL_TYPE_LABELS: Record = { http: "HTTP", mcp: "MCP", client: "Client", + task: "后台任务", }; type ResultPathSuggestion = { @@ -146,6 +147,9 @@ function suggestedResultVariable(tool: Tool): { } function parametersFor(tool: Tool): ToolParameter[] { + if (tool.definition.type === "task") { + return [{ name: "instruction", type: "string", location: "body", description: "远程任务要求", required: true }]; + } if (tool.definition.type === "mcp") { const schema = tool.definition.config.inputSchema as { properties?: Record; @@ -535,6 +539,7 @@ export function ToolBindingEditor({ onChange, allowModel = true, maxBindings, + allowTask = false, }: { tools: Tool[]; selectableTools?: Tool[]; @@ -543,6 +548,7 @@ export function ToolBindingEditor({ onChange: (value: ToolBinding[]) => void; allowModel?: boolean; maxBindings?: number; + allowTask?: boolean; }) { const [pickerOpen, setPickerOpen] = useState(false); const [openToolId, setOpenToolId] = useState(null); @@ -551,13 +557,14 @@ export function ToolBindingEditor({ [tools], ); const pickerTools = useMemo( - () => (selectableTools ?? tools).filter((tool) => tool.status === "active"), - [selectableTools, tools], + () => (selectableTools ?? tools).filter((tool) => tool.status === "active" && (allowTask || tool.type !== "task")), + [selectableTools, tools, allowTask], ); const selectedIds = new Set(value.map((binding) => binding.toolId)); const variableNames = [...Object.keys(variables), ...SYSTEM_VARIABLE_NAMES]; function addTool(tool: Tool) { + if (tool.type === "task" && value.some(binding => tools.find(item => item.id === binding.toolId)?.type === "task")) return; const binding = defaultToolBinding(tool); if (!allowModel) { binding.argumentBindings = Object.fromEntries( @@ -735,14 +742,14 @@ export function ToolBindingEditor({ ); })} - updateBinding(index, { ...binding, resultAssignments }) } - /> + />}
)} diff --git a/frontend/src/hooks/use-voice-preview.ts b/frontend/src/hooks/use-voice-preview.ts index d13688f..f64f98a 100644 --- a/frontend/src/hooks/use-voice-preview.ts +++ b/frontend/src/hooks/use-voice-preview.ts @@ -663,7 +663,7 @@ export function useVoicePreview( ]), ); } else if ( - msg.type === "workflow-event" && + (msg.type === "workflow-event" || msg.type === "task-event") && typeof msg.event === "string" && msg.internalStage !== true ) { diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 483f914..ef89f7b 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -623,16 +623,31 @@ export type McpToolDefinition = { }; }; +export type TaskToolDefinition = { + schemaVersion: number; + type: "task"; + config: { + provider: "opencode"; + url: string; + directory: string; + username: string; + timeoutSeconds: number; + allowInterruptions: true; + executionMode: "immediate"; + }; +}; + export type Tool = { id: string; name: string; functionName: string; - type: "http" | "mcp" | "client"; + type: "http" | "mcp" | "client" | "task"; description: string; definition: | HttpToolDefinition | ClientToolDefinition - | McpToolDefinition; + | McpToolDefinition + | TaskToolDefinition; secrets: Record; status: ToolStatus; mcpServerId?: string | null; @@ -966,3 +981,30 @@ export const batchRunsApi = { { method: "POST" }, ), }; + +// ---------- 提示词后台任务 ---------- +export type BackgroundTask = { + id: string; + assistantId: string; + conversationId: string; + toolId: string; + instruction: string; + status: "queued" | "submitted" | "running" | "waiting_input" | "cancel_requested" | "succeeded" | "failed" | "cancelled" | "unknown"; + summary: string; + result: string; + sequence: number; + createdAt: string; + updatedAt: string; + inputRequest: { + id?: string; + kind?: "permission" | "question"; + permission?: string; + patterns?: string[]; + questions?: Array<{ question: string; header?: string; multiple?: boolean; options?: Array<{ label: string; description: string }> }>; + }; +}; +export const backgroundTasksApi = { + list: (assistantId: string) => request(`/api/background-tasks?assistant_id=${encodeURIComponent(assistantId)}`), + cancel: (id: string) => request(`/api/background-tasks/${encodeURIComponent(id)}/cancel`, { method: "POST" }), + input: (id: string, value: { reply?: string; answers?: string[][] }) => request(`/api/background-tasks/${encodeURIComponent(id)}/input`, { method: "POST", body: JSON.stringify(value) }), +}; diff --git a/implement-stage/BUILD_NOTE.md b/implement-stage/BUILD_NOTE.md index 2537079..54158b7 100644 --- a/implement-stage/BUILD_NOTE.md +++ b/implement-stage/BUILD_NOTE.md @@ -5,13 +5,14 @@ | F0 | 原生Job主线、断线独立与取消 | backend/.venv/bin/python -m unittest discover -s backend/tests -p test_background_task_native.py | MUST | passed | | F1 | OpenCode协议适配与状态关联 | cd backend && .venv/bin/python -m unittest tests.test_background_task_native tests.test_opencode_tasks | MUST | passed | | F2 | 持久记录、管理API、应用宿主 | cd backend && .venv/bin/python -m unittest tests.test_background_tasks | MUST | passed | -| F3 | 提示词绑定、任务通知、网页 | cd frontend && npx tsc --noEmit | MUST | pending | +| F3 | 提示词绑定、任务通知、网页 | cd frontend && npx tsc --noEmit | MUST | passed | | F4 | 回归、文档与假设审阅 | make test | MUST | pending | ## Run record - F0: PYTHONPATH=backend backend/.venv/bin/python -m unittest discover -s backend/tests -p test_background_task_native.py → exit 0; native-jobs-smoke.json。 - F1: 原生 Job + httpx 模拟远端协议共 3 项测试通过；未调用真实模型。 - F2: 累计 7 项原生Job、协议、服务生命周期与密钥保留测试通过。 +- F3: 累计9项后端任务测试通过，TypeScript检查通过，前端lint无错误（BatchTestPage已有1条warning）。 ## Deferred - 真实远程 OpenCode + 模型联调：未提供服务地址/凭证。 - 多进程分布式总线及通用插件发现：超出单进程 MVP。