feat: wire optional progress reminders to actual requests and verified readback
This commit is contained in:
@@ -30,6 +30,7 @@ import { BRAND, OrvenMark } from './brand';
|
||||
import { WorkbenchTools } from './WorkbenchTools';
|
||||
import type { WorkbenchAction } from './WorkbenchTools';
|
||||
import { AppearancePanel } from './AppearancePanel';
|
||||
import { ProgressReminderSettings } from './ProgressReminders';
|
||||
import { Palette as PaletteIcon } from 'lucide-react';
|
||||
|
||||
const activeStates = ['running', 'awaiting_approval', 'stopping'];
|
||||
@@ -81,6 +82,7 @@ export default function App() {
|
||||
const [inspectorOpen, setInspectorOpen] = useState(false);
|
||||
const [toolsOpen, setToolsOpen] = useState(false);
|
||||
const [appearanceOpen, setAppearanceOpen] = useState(false);
|
||||
const [reminderSettingsOpen, setReminderSettingsOpen] = useState(false);
|
||||
const [narrow, setNarrow] = useState(() => window.innerWidth <= 940);
|
||||
const [viewportWidth,setViewportWidth]=useState(()=>window.innerWidth);
|
||||
const [mobile, setMobile] = useState(() => window.innerWidth <= 620);
|
||||
@@ -574,6 +576,7 @@ export default function App() {
|
||||
{ id: 'research', label: '机制研究与设计', description: '阅读已有研究报告与机制说明', group: '能力与研究', icon: BookOpenText, run: () => void openResearch() },
|
||||
{ id: 'models', label: '模型中心', description: '选择模型、管理连接和模型池', group: '设置与连接', icon: ModelServer, run: () => setModelCenterOpen(true) },
|
||||
{ id: 'appearance', label: '外观', description: '选择深青绿、雾蓝或鸢尾紫,自动记住你的偏好', group: '设置与连接', icon: PaletteIcon, run: () => setAppearanceOpen(true) },
|
||||
{ id: 'progress-reminders', label: '进展提醒', description: '可选的重复读取与参数错误建议,查看实际送达和回读', group: '设置与连接', icon: Activity, run: () => setReminderSettingsOpen(true) },
|
||||
{ id: 'diagnostics', label: '运行诊断', description: '检查连接、终端与最近错误', group: '设置与连接', icon: Activity, run: () => void openDiagnostics() },
|
||||
{ id: 'companion', label: '手机连接', description: '在手机上查看和接续电脑任务', group: '设置与连接', icon: Link2, run: () => setCompanionOpen(true) },
|
||||
...(desktop ? [{ id: 'desktop', label: '桌面宿主', description: '查看窗口、后台任务与本地宿主', group: '设置与连接', icon: SquareTerminal, run: () => setDesktopOpen(true) }] : []),
|
||||
@@ -661,6 +664,7 @@ export default function App() {
|
||||
</aside>
|
||||
{toolsOpen && <Modal title="工具箱" description="项目的上下文、能力和连接,都在这里。" onClose={() => setToolsOpen(false)}><WorkbenchTools actions={actions} onClose={() => setToolsOpen(false)} /></Modal>}
|
||||
{appearanceOpen && <Modal title="外观" description="选择适合你的工作台配色,切换后立即生效。" onClose={() => setAppearanceOpen(false)}><AppearancePanel /></Modal>}
|
||||
{reminderSettingsOpen && <Modal title="进展提醒" description="根据原工具结果提供可选建议,并核对后续进展。" onClose={() => setReminderSettingsOpen(false)}><ProgressReminderSettings /></Modal>}
|
||||
{installationOpen && <Modal title="版本与更新" description="核对本机版本、真实更新阶段与原始结果。" onClose={() => setInstallationOpen(false)}><InstallationStatus /></Modal>}
|
||||
{projectOpen && <Modal title="打开项目" description="选择这台电脑上的项目文件夹,或输入完整路径。" onClose={() => { if (!projectBusy) { setProjectOpen(false); setDirectoryPickerOpen(false); setProjectError(''); } }}><form onSubmit={event => { event.preventDefault(); if (!directoryPickerOpen) void openProject(); }}><label className="form-field">项目文件夹<input autoFocus value={projectInput} disabled={projectBusy} onChange={event => { setProjectInput(event.target.value); setProjectError(''); }} placeholder="C:\Projects\my-app" aria-label="项目文件夹路径" /></label>{projectError && <p className="local-files-error" role="alert">{projectError}</p>}{directoryPickerOpen && <ProjectDirectoryPicker initialPath={projectInput.trim()} onChoose={value => { setProjectInput(value); setProjectError(''); setDirectoryPickerOpen(false); }} onCancel={() => setDirectoryPickerOpen(false)} />}<div className="modal-actions"><button type="button" className="button secondary" disabled={pickingProject || projectBusy} onClick={() => desktop ? void pickDesktopProject() : setDirectoryPickerOpen(value => !value)}><FolderOpen size={15} />选择文件夹</button>{exampleId && <button type="button" className="button secondary" disabled={projectBusy} onClick={() => { chooseProject(exampleId); setProjectOpen(false); setDirectoryPickerOpen(false); }}>打开示例项目</button>}<button type="submit" className="button primary" disabled={!projectInput.trim() || projectBusy || directoryPickerOpen}>{projectBusy ? <LoaderCircle className="spin" size={15} /> : <FolderOpen size={15} />}{projectBusy ? '正在打开…' : '打开项目'}</button></div></form></Modal>}
|
||||
{companionOpen && <Modal title="手机连接" description="指定项目和权限,连接到同一个Windows执行宿主。" onClose={() => setCompanionOpen(false)} wide><CompanionPanel projects={projects} selectedProjectId={selectedProject?.id ?? ''} /></Modal>}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
.reminder-settings { padding: 4px 2px 12px; font-size: 14px; line-height: 1.7; }
|
||||
.reminder-settings p { margin: 14px 0; }
|
||||
.reminder-toggle { display: flex; align-items: center; justify-content: space-between; gap: 20px; padding: 12px 0 18px; border-bottom: 1px solid var(--orven-line); cursor: pointer; }
|
||||
.reminder-toggle span { display: grid; gap: 4px; }
|
||||
.reminder-toggle strong { font-size: 15px; }
|
||||
.reminder-toggle small { font-size: 12px; color: var(--orven-muted); }
|
||||
.reminder-toggle input { width: 21px; height: 21px; flex: 0 0 auto; accent-color: var(--orven-accent); cursor: pointer; }
|
||||
.reminder-readback { margin-top: 16px; padding-top: 12px; border-top: 1px solid var(--orven-line); }
|
||||
.reminder-readback h4 { margin: 0 0 8px; font-size: 13px; }
|
||||
.reminder-evidence { display: flex; flex-wrap: wrap; gap: 4px 12px; }
|
||||
@media (max-width: 620px) { .reminder-readback button, .reminder-settings button { min-height: 44px; } .reminder-toggle { min-height: 60px; } }
|
||||
@@ -0,0 +1,73 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { LoaderCircle } from 'lucide-react';
|
||||
import { api } from './api';
|
||||
import type { ReminderInspection, Run } from './types';
|
||||
import './ProgressReminders.css';
|
||||
|
||||
export function ProgressReminderSettings() {
|
||||
const [enabled, setEnabled] = useState<boolean | null>(null), [saving, setSaving] = useState(false);
|
||||
const [error, setError] = useState(''), [notice, setNotice] = useState(''), [reload, setReload] = useState(0);
|
||||
useEffect(() => {
|
||||
let alive = true; setError(''); setEnabled(null);
|
||||
api<{ enabled: boolean }>('/progress-reminders/settings').then(value => { if (alive) setEnabled(value.enabled); })
|
||||
.catch(() => { if (alive) setError('暂时无法读取提醒设置,请重试。'); });
|
||||
return () => { alive = false; };
|
||||
}, [reload]);
|
||||
async function toggle(next: boolean) {
|
||||
setSaving(true); setError(''); setNotice('');
|
||||
try {
|
||||
const saved = await api<{ enabled: boolean }>('/progress-reminders/settings', { enabled: next });
|
||||
setEnabled(saved.enabled); setNotice(saved.enabled ? '已开启,并保存为后续运行的偏好。' : '已关闭,后续请求不再附加建议。');
|
||||
} catch { setError('设置未保存,请重试。原选择仍然保留。'); }
|
||||
finally { setSaving(false); }
|
||||
}
|
||||
return <div className="reminder-settings">
|
||||
<label className="reminder-toggle"><span><strong>开启进展提醒</strong><small>默认关闭。你的选择会自动保存。</small></span>
|
||||
{enabled === null ? <LoaderCircle size={18} className="spin" aria-label="正在读取设置" />
|
||||
: <input type="checkbox" role="switch" aria-label="开启进展提醒" checked={enabled} disabled={saving} onChange={event => void toggle(event.target.checked)} />}</label>
|
||||
<p>仅在文件任务连续重复读取相同内容,或连续出现相同参数错误时,附加可选建议。正常分页、研究和等待检查继续按原任务进行。</p>
|
||||
<p>在任务记录中查看建议随哪次请求发出、后续是否出现对应工具结果。回复“明白”不会被记为解决。</p>
|
||||
<p className="record-footnote">本设置不改变操作权限、模型额度或历史传递。当前执行中的请求保留原记录;外部引擎与压缩历史不附加建议。</p>
|
||||
{notice && <p role="status">{notice}</p>}
|
||||
{saving && <p role="status">正在保存…</p>}
|
||||
{error && <div role="alert"><p>{error}</p>{enabled === null && <button type="button" className="text-button" onClick={() => setReload(value => value + 1)}>重新读取</button>}</div>}
|
||||
</div>;
|
||||
}
|
||||
|
||||
const labels: Record<string, string> = { pending: '待发送', delivered: '已随请求发出', resolved: '已观察到进展', expired: '已过期' };
|
||||
const reasons: Record<string, string> = { disabled: '已关闭提醒', cancelled: '运行已取消', run_finished: '运行已结束', ttl: '建议已过期',
|
||||
research: '保留只读研究', waiting: '等待所属操作', user_boundary: '用户要求已变化', new_failure: '出现新的失败证据',
|
||||
ineffective: '重复建议未见效果,已停止附加', tool_unavailable_or_advice_too_large: '本轮不再适用' };
|
||||
|
||||
export function ReminderReadback({ sessionId, run, openArtifact }: { sessionId: string; run: Run; openArtifact: (id: string) => void }) {
|
||||
const [view, setView] = useState<ReminderInspection | null>(null), [error, setError] = useState(''), [reload, setReload] = useState(0);
|
||||
const recorded = !!run.progressReminders || !!run.progressReminderError;
|
||||
useEffect(() => {
|
||||
let alive = true; setView(null); setError('');
|
||||
if (recorded) api<ReminderInspection>('/sessions/' + sessionId + '/progress-reminders?run=' + run.id)
|
||||
.then(value => { if (alive) setView(value); }).catch(() => { if (alive) setError('暂时无法核对提醒记录。'); });
|
||||
return () => { alive = false; };
|
||||
}, [sessionId, run.id, run.progressReminderReceiptId, run.progressReminderError?.phase, recorded, reload]);
|
||||
if (!recorded) return null;
|
||||
return <section className="reminder-readback" aria-label="提醒与回读">
|
||||
<h4>提醒与回读</h4>
|
||||
{!view && !error && <p role="status">正在核对原始记录…</p>}
|
||||
{error && <p role="alert">{error}<button type="button" className="text-button" onClick={() => setReload(value => value + 1)}>重新核对</button></p>}
|
||||
{view && !view.evidenceVerified && <p role="alert">提醒依据暂时无法核对。原任务和执行结果保留。</p>}
|
||||
{view?.evidenceVerified && <>
|
||||
{view.error && <p className="record-footnote">部分提醒未能记录,原任务继续执行。</p>}
|
||||
{!view.items.length && <p className="record-footnote">本次运行没有生成建议。</p>}
|
||||
<ol>{view.items.map(item => <li key={item.key}>
|
||||
<strong>{item.category === 'repeated_read' ? '重复读取建议' : '参数错误建议'} · {labels[item.status] ?? item.status}</strong>
|
||||
<p>{item.deliveries.length ? `已随 ${item.deliveries.length} 次请求发出` : '尚未随请求发出'}{item.exitReason ? ` · ${reasons[item.exitReason] ?? item.exitReason}` : ''}</p>
|
||||
{item.resolution && <p>{item.resolution.relation === 'naturally_resolved' ? '发送前已自然出现对应工具结果。' : '发送后已出现对应工具结果,因果关系未证实。'}{item.resolution.kind === 'new_read_range' ? '已取得新的读取区间。' : '原参数错误工具已返回成功结果。'}</p>}
|
||||
<div className="reminder-evidence">{item.source.map((ref, index) => <button type="button" className="text-button" key={ref.artifactId} onClick={() => openArtifact(ref.artifactId)}>原观察 {index + 1}</button>)}
|
||||
{item.deliveries.map((delivery, index) => <button type="button" className="text-button" key={delivery.requestId} onClick={() => openArtifact(delivery.requestArtifactId)}>实际请求 {index + 1}</button>)}
|
||||
{item.resolution && <button type="button" className="text-button" onClick={() => openArtifact(item.resolution!.source.artifactId)}>回读依据</button>}
|
||||
</div>
|
||||
</li>)}</ol>
|
||||
{view.receiptArtifactId && <button type="button" className="text-button" onClick={() => openArtifact(view.receiptArtifactId!)}>查看提醒原收据</button>}
|
||||
<p className="record-footnote">工具进展与业务完成分别核对;送达记录不代表模型收到、采纳或节省了 tokens。</p>
|
||||
</>}
|
||||
</section>;
|
||||
}
|
||||
@@ -120,7 +120,7 @@ export function TaskPanel({ project, session, onSession, onError, busy, onWorksp
|
||||
<dt>本次预算</dt><dd>{run.budget?.maxTokens === 0 ? 'tokens 不限' : number(run.budget?.maxTokens) + ' tokens'} · {run.budget?.maxDurationMs === 0 ? '时长不限' : Math.round((run.budget?.maxDurationMs ?? 0) / 60000) + ' 分钟'} · {run.budget?.maxSteps === 0 ? '轮次不限' : run.budget?.maxSteps + ' 轮'}</dd><dt>任务累计</dt><dd>{number(execution?.accountedTaskTokens)} / {task.budget.maxTokens === 0 ? '不限' : number(task.budget.maxTokens)} tokens</dd>
|
||||
</dl>{run.stopReason && <p className="run-stop">{stopReasons[run.stopReason] || run.stopReason}</p>}
|
||||
<p className="record-footnote">用量按请求尝试累计,包含失败响应已报告的 tokens;未报告的请求单独估算。历史缺失不补造,tokens 不等于费用。</p>
|
||||
<TurnProgress run={run} openArtifact={openArtifact} />
|
||||
<TurnProgress sessionId={session.id} run={run} openArtifact={openArtifact} />
|
||||
</> : <p className="record-empty"><LoaderCircle size={14} className="spin" />正在读取运行记录</p>}
|
||||
</section>}
|
||||
{run && <RequestContextPanel session={session} runId={run.id} onError={onError} openArtifact={openArtifact} />}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import type { Run } from './types';
|
||||
import { ReminderReadback } from './ProgressReminders';
|
||||
const labels: Record<string, string> = { baseline: '本次运行基线', waiting: '等待所属操作', evidence_growth: '新增外显证据', new_failure_evidence: '新增失败证据',
|
||||
user_boundary: '用户边界变化', repeated_failure_candidate: '重复失败候选', repeated_read_candidate: '重复读取候选', no_observed_change: '未见新外显事实', unknown_bounded: '观察容量已满,保留未知' };
|
||||
const failureLabels: Record<string, string> = { invalid_input: '参数无效', permission: '权限或审批拒绝', requires_verification: '结果待核对', network: '网络连接', service: '上游服务',
|
||||
authentication: '身份验证', rate_limit: '请求限流', quota: '服务额度', tool_or_environment: '工具或环境', unknown: '尚未分类' };
|
||||
export function TurnProgress({ run, openArtifact }: { run: Run; openArtifact: (id: string) => void }) {
|
||||
if (!run.progressShadow && !run.progressShadowError) return null;
|
||||
export function TurnProgress({ sessionId, run, openArtifact }: { sessionId: string; run: Run; openArtifact: (id: string) => void }) {
|
||||
if (!run.progressShadow && !run.progressShadowError && !run.progressReminders && !run.progressReminderError) return null;
|
||||
const shadow = run.progressShadow;
|
||||
return <details className="turn-progress" aria-label="单轮观察">
|
||||
<summary>单轮观察 · 仅记录{shadow ? ` · 已保留 ${shadow.turns.filter(row => row.phase === 'settled').length} 轮` : ''}</summary>
|
||||
@@ -21,5 +22,6 @@ export function TurnProgress({ run, openArtifact }: { run: Run; openArtifact: (i
|
||||
{!!turn.waiting.length && <p>等待 {turn.waiting.map(row => ({ approval: '审批', check_job: '检查作业', review: '审查' }[row.kind] ?? row.kind)).join('、')}</p>}
|
||||
{run.progressShadowArtifactIds?.[index] && <button className="text-button" onClick={() => openArtifact(run.progressShadowArtifactIds![index])}>查看原观察收据</button>}
|
||||
</li>)}</ol>
|
||||
<ReminderReadback key={sessionId + '/' + run.id} sessionId={sessionId} run={run} openArtifact={openArtifact} />
|
||||
</details>;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ export interface Config {
|
||||
executionMode?: 'unrestricted' | 'restricted';
|
||||
capacityMode?: 'passthrough' | 'model' | 'manual';
|
||||
historyPolicy?: 'preserve' | 'compact';
|
||||
progressRemindersEnabled?: boolean;
|
||||
maxRunDurationMs: number; maxRunTokens: number; maxTaskTokens: number;
|
||||
modelResponseTimeoutMs?: number; modelStreamIdleTimeoutMs?: number;
|
||||
}
|
||||
@@ -152,6 +153,14 @@ export interface TurnObservation {
|
||||
waiting: { kind: string; id: string }[];
|
||||
}
|
||||
export interface Run { progressShadow?: { mode: 'shadow'; observations: number; truncated: boolean; turns: TurnObservation[] }; progressShadowArtifactIds?: string[]; progressShadowError?: { kind: string; phase: string } }
|
||||
export interface ReminderSource { artifactId: string; sha256: string; ordinal: number }
|
||||
export interface ProgressReminder { key: string; category: string; status: string; createdAt: number; expiresAt: number; source: ReminderSource[];
|
||||
toolNames: string[]; expected: { kind: string }; exitReason?: string;
|
||||
deliveries: { requestId: string; requestArtifactId: string; requestSha256: string; dispatchedAt: number }[];
|
||||
resolution?: { source: ReminderSource; kind: string; relation: string; causality: string } }
|
||||
export interface ReminderInspection { enabled: boolean; recorded: boolean; evidenceVerified: boolean; receiptArtifactId: string | null;
|
||||
items: ProgressReminder[]; error: { kind: string; phase: string } | null }
|
||||
export interface Run { progressReminders?: { enabled: boolean; items: ProgressReminder[] }; progressReminderReceiptId?: string; progressReminderError?: { kind: string; phase: string } }
|
||||
export interface RunBrief { purpose?: 'execution' | 'diagnostic'; source?: string; taskStatusBefore?: string; consumption?: ModelConsumption[] }
|
||||
export interface Run { question?: string; diagnosticContext?: { artifactId: string; sha256: string; originalRunId: string | null } }
|
||||
export interface DiagnosticContext {
|
||||
|
||||
Reference in New Issue
Block a user