mirror of
https://github.com/ThearchyHelios/AgentLab.git
synced 2026-11-19 02:21:58 +00:00
应用平台集成(前端):钩子按名字管理并只显示一次密钥、按新口径补算、应用助手对话历史、设置页按角色收起与身份设置补管理员用户名、按需视图每日上限、界面偏好按角色只存本地、使用者问数据用数据源名单并在运行流连不上时改轮询、能力字段待审阅、记录页按来源筛选与待办 id、编辑器的入口 / 表单 / 待办外观 JSON 分区、画布 ?publish=1、工具页绑定端点与 MCP 认证头掩码编辑、派给自己的新待办系统通知、样例与检查脚本改走待办接口(含统一复核后的修复)
This commit is contained in:
@@ -3,6 +3,7 @@ import { ReactFlow, ReactFlowProvider } from '@xyflow/react'
|
||||
import { Inspector } from '../../canvas/Inspector'
|
||||
import { NodeCard } from '../../canvas/NodeCard'
|
||||
import { ApprovalCard } from '../../run/RunPanel'
|
||||
import { withTask } from '../taskOf'
|
||||
import { ChallengeSummary } from '../../run/ChallengeSummary'
|
||||
import { useCatalog } from '../../store/catalog'
|
||||
import { useStudio } from '../../store/studio'
|
||||
@@ -66,7 +67,7 @@ function Card({ approval, name, dense = false }: { approval: Approval; name: str
|
||||
return (
|
||||
<div className={dense ? 'w-[360px] max-w-full border-r bg-panel' : 'mx-auto max-w-3xl p-4'} data-fixture={name}>
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
<ApprovalCard approval={approval} onResolved={() => undefined} />
|
||||
<ApprovalCard approval={withTask(approval)} onResolved={() => undefined} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useState } from 'react'
|
||||
import type { JSX } from 'react'
|
||||
import { ReactFlow, ReactFlowProvider } from '@xyflow/react'
|
||||
import { ApprovalCard } from '../../run/RunPanel'
|
||||
import { withTask } from '../taskOf'
|
||||
import { Inspector } from '../../canvas/Inspector'
|
||||
import { NodeCard } from '../../canvas/NodeCard'
|
||||
import { EvidencePane } from '../../pages/runs/EvidencePane'
|
||||
@@ -73,7 +74,7 @@ function approvalOf(search: string): Approval {
|
||||
function Card({ value }: { value: Approval }) {
|
||||
return (
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
<ApprovalCard approval={value} onResolved={(id) => { (window as any).__dualResolved = id }} />
|
||||
<ApprovalCard approval={withTask(value)} onResolved={(id) => { (window as any).__dualResolved = id }} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { parseServerTime } from '../../lib/format'
|
||||
import { ArtifactsPane, useRunArtifacts } from '../../pages/runs/ArtifactsPane'
|
||||
import { EvidencePane } from '../../pages/runs/EvidencePane'
|
||||
import { ApprovalCard } from '../../run/RunPanel'
|
||||
import { withTask } from '../taskOf'
|
||||
import { emptyTrace } from '../../run/trace'
|
||||
import type { Approval, ApprovalReport, Run } from '../../types'
|
||||
import fx from './inquiry.json'
|
||||
@@ -54,7 +55,7 @@ function Card({ approval, name, dense = false }: { approval: Approval; name: str
|
||||
return (
|
||||
<div className={dense ? 'w-[360px] max-w-full border-r bg-panel' : 'mx-auto max-w-3xl p-4'} data-fixture={name}>
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
<ApprovalCard approval={approval} onResolved={() => undefined} />
|
||||
<ApprovalCard approval={withTask(approval)} onResolved={() => undefined} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
@@ -68,7 +69,7 @@ function TwoPlaces({ approval }: { approval: Approval }) {
|
||||
{pop && createPortal(
|
||||
<div role="dialog" aria-label="审批卡" data-fixture-pop=""
|
||||
className="fixed left-4 top-4 z-50 max-h-[90vh] w-[380px] overflow-y-auto rounded-lg border bg-panel shadow-elev-3">
|
||||
<ApprovalCard approval={approval} showWorkflow={false} />
|
||||
<ApprovalCard approval={withTask(approval)} showWorkflow={false} />
|
||||
</div>,
|
||||
document.body,
|
||||
)}
|
||||
@@ -78,7 +79,7 @@ function TwoPlaces({ approval }: { approval: Approval }) {
|
||||
</button>
|
||||
</div>
|
||||
<aside className="w-[380px] shrink-0 border-l bg-panel" data-fixture-panel="">
|
||||
<ApprovalCard approval={approval} showWorkflow={false} />
|
||||
<ApprovalCard approval={withTask(approval)} showWorkflow={false} />
|
||||
</aside>
|
||||
</div>
|
||||
)
|
||||
@@ -97,8 +98,8 @@ function Steps({ name, keyed }: { name: string; keyed: boolean }) {
|
||||
<button type="button" className="btn btn-xs mb-2" data-fixture-next="" onClick={() => setAt((n) => n + 1)}>处理掉这张</button>
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
{keyed
|
||||
? <ApprovalCard key={approval.id} approval={approval} onResolved={() => undefined} />
|
||||
: <ApprovalCard approval={approval} onResolved={() => undefined} />}
|
||||
? <ApprovalCard key={approval.id} approval={withTask(approval)} onResolved={() => undefined} />
|
||||
: <ApprovalCard approval={withTask(approval)} onResolved={() => undefined} />}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
@@ -133,7 +134,7 @@ function Waiting({ approval, run }: { approval: Approval; run: Run }) {
|
||||
<div className="flex min-h-screen min-w-0 flex-col" data-fixture="inquiry-run-waiting">
|
||||
<div className="mx-auto w-full max-w-3xl p-4" data-fixture-card="">
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
<ApprovalCard approval={approval} onResolved={() => undefined} showWorkflow={false} />
|
||||
<ApprovalCard approval={withTask(approval)} onResolved={() => undefined} showWorkflow={false} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="h-[80vh] min-w-0 border-t" data-fixture-evidence="">
|
||||
|
||||
@@ -6,6 +6,7 @@ import { Database, MessageSquare, RotateCw } from 'lucide-react'
|
||||
import { AssistantStream, StreamEmpty, type StreamTurn } from '../run/AssistantStream'
|
||||
import { Markdown } from '../run/Markdown'
|
||||
import { ApprovalCard } from '../run/RunPanel'
|
||||
import { withTask } from './taskOf'
|
||||
import { decodeCopilot, decodeRun } from '../run/decode'
|
||||
import { catalogPatchesOf } from '../run/catalogPatch'
|
||||
import { ToastHost } from '../components/ui'
|
||||
@@ -341,11 +342,13 @@ function synthetic(name: string): StreamTurn[] {
|
||||
return [{ id: 'cancelled', question: '把大表全量拉一遍', phase: 'done', statusCode: 'cancelled',
|
||||
steps: decodeRun(cancelledRun()), runId: 'syn-cancel' }]
|
||||
case 'chat': {
|
||||
// 问数据的一轮:先建图、再执行。执行开始后「规划」收成一行
|
||||
// 问数据的一轮:先建图(按需查看了两张表:look 事件)、再执行。执行开始后「规划」收成一行
|
||||
const plan = decodeCopilot([
|
||||
{ op: 'heartbeat', phase: 'looking', elapsed_ms: 1800 },
|
||||
{ op: 'look', id: 'L1', by: 'model', need: '设备 KPI 和设备维度', status: 'ok', elapsed_ms: 2100, objects: [
|
||||
{ kind: 'table', source: 'warehouse', source_id: 'src-warehouse', named: [], picked: ['v_device_kpi', 'dim_device'],
|
||||
joined: [], missing: [], total: 53 }] },
|
||||
{ op: 'heartbeat', phase: 'planning', elapsed_ms: 6400 },
|
||||
{ op: 'context', elapsed_ms: 2100, sources: [
|
||||
{ source: 'warehouse', tables: ['v_device_kpi', 'dim_device'], selected_by: 'model', total: 53 }] },
|
||||
{ op: 'thinking', delta: '要先查表结构,再按设备汇总 KPI。' },
|
||||
{ op: 'plan', summary: '取数 → 汇总 → 出结论' },
|
||||
{ op: 'add_node', node: { id: 'q', type: 'tool', label: '查询设备 KPI' } },
|
||||
@@ -570,7 +573,7 @@ function Preview() {
|
||||
return (
|
||||
<div className={dense ? 'w-[360px] border-r' : 'mx-auto max-w-3xl p-4'}>
|
||||
<div className="overflow-hidden rounded-lg border" style={{ borderColor: 'var(--warn)' }}>
|
||||
<ApprovalCard approval={approval} onResolved={() => undefined} />
|
||||
<ApprovalCard approval={withTask(approval)} onResolved={() => undefined} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* 预览里合成的审批带上它对应的待办(应用平台 X4:一次中断对应一条 Approval 和一条 Task,审批卡内容在 run/TaskCard,
|
||||
* 回复走 /api/tasks/{id}/respond)。审批卡(RunPanel 的 ApprovalCard)看到审批上带着 task 就直接用,不再按运行去取待办
|
||||
* ——预览页没有服务端,按运行取只会落到「未能读取这条审批对应的待办」。
|
||||
*
|
||||
* 种类同服务端 process/tasks.kind_of:人工节点按 mode,工具审批、代码审批、双盲复算、动作确认按中断内容的 kind。
|
||||
* 检查脚本按 task-<审批 id> 伪造 /api/tasks/{id}/respond
|
||||
*/
|
||||
import type { Approval } from '../types'
|
||||
import type { Task, TaskKind } from '../typesApp'
|
||||
|
||||
const KIND_OF: Record<string, TaskKind> = {
|
||||
tool_approval: 'tool', code_approval: 'code', dual_check: 'dual_check', action_confirm: 'action_confirm',
|
||||
}
|
||||
|
||||
export const taskIdOf = (approvalId: string) => `task-${approvalId}`
|
||||
|
||||
export function taskOf(a: Approval, patch: Partial<Task> = {}): Task {
|
||||
const p: Record<string, any> = a.payload ?? {}
|
||||
const mode = String(p.mode ?? a.mode ?? 'approve')
|
||||
const kind: TaskKind = p.kind === 'human_node'
|
||||
? (mode === 'input' || mode === 'edit' ? mode : 'approve')
|
||||
: KIND_OF[String(p.kind)] ?? 'approve'
|
||||
const pending = a.status === 'pending'
|
||||
return {
|
||||
id: taskIdOf(a.id), approval_id: a.id, run_id: a.run_id, node_id: a.node_id, node_label: a.node_label ?? null,
|
||||
run_class: a.run_class ?? null, workflow_id: a.workflow_id ?? null, workflow_name: a.workflow_name ?? null,
|
||||
app_id: null, app_version: null, kind, title: a.title, form: null, policy: { kind: 'any' },
|
||||
status: pending ? 'pending' : 'resolved', due_at: null, escalation_level: 0, payload: p,
|
||||
assignments: [{
|
||||
id: `as-${a.id}`, principal_kind: 'anyone', principal: '', source: 'anyone', status: pending ? 'pending' : 'responded',
|
||||
responded_by: a.resolved_by ?? null, responded_at: a.resolved_at ?? null, verified: false,
|
||||
}],
|
||||
can_respond: pending, outcome: pending ? null : (a.response ?? {}), resolved_by: a.resolved_by ?? null,
|
||||
resolved_at: a.resolved_at ?? null, created_at: a.created_at ?? new Date().toISOString(), ...patch,
|
||||
}
|
||||
}
|
||||
|
||||
/** 审批带上待办和待办 id(同服务端审批列表上的 task_id) */
|
||||
export function withTask<A extends Approval>(a: A): A & { task: Task; task_id: string } {
|
||||
const task = taskOf(a)
|
||||
return { ...a, task_id: task.id, task }
|
||||
}
|
||||
Reference in New Issue
Block a user