fix: complete unrestricted waits catalog and network flows

This commit is contained in:
Agent Workbench Dev
2026-11-06 06:21:59 +08:00
parent c93c434808
commit c9c77c7ee6
32 changed files with 295 additions and 84 deletions
+7 -5
View File
@@ -57,7 +57,9 @@ export function ModelCatalog({ sources, sourceId = '', busy, onSaved, onClose }:
finally { if (live.current) setSaving(false); }
}
const visible = preview?.entries.filter(value => (value.id + ' ' + value.name + ' ' + value.owner).toLowerCase().includes(query.trim().toLowerCase())) ?? [];
const selectable = visible.filter(value => value.lifecycle !== 'retired');
const open = preview?.limits.connections === null;
const selectionLimit = preview?.limits.connections ?? Infinity, poolLimit = preview?.limits.poolMembers ?? Infinity;
const selectable = visible.filter(value => open || value.lifecycle !== 'retired');
return <section className="mc-editor mc-catalog" aria-label="上游模型目录" ref={region}>
<div className="mc-section-title"><div><h3>从上游选择模型</h3><p>获取目录,勾选要用的型号,再决定手动指定或自动适配。</p></div><button className="button secondary" disabled={saving} onClick={onClose}>关闭目录</button></div>
<div className="mc-form-grid">
@@ -86,11 +88,11 @@ export function ModelCatalog({ sources, sourceId = '', busy, onSaved, onClose }:
{preview && <>
<div className="mc-catalog-heading"><label>搜索模型<input aria-label="搜索上游模型" value={query} onChange={event => setQuery(event.target.value)} placeholder="型号、显示名称或提供方" /></label><span>显示 {visible.length} / {preview.entries.length} · 已选 {chosen.length}</span></div>
{preview.warning && <p className="mc-card-warning">{preview.warning}</p>}
<p className="mc-help">以下为上游目录声明,尚未经过模型调用验证。目录最多1000项,本机最多100个模型连接;单个自动池最多32个成员。</p>
<div className="mc-row-actions"><button className="button secondary" disabled={locked || !selectable.length || new Set([...chosen, ...selectable.map(value => value.id)]).size > 100} onClick={() => setChosen([...new Set([...chosen, ...selectable.map(value => value.id)])])}>选中当前筛选</button><button className="button secondary" disabled={locked || !chosen.length} onClick={() => setChosen([])}>清空选择</button></div>
<p className="mc-help">以下为上游目录声明,尚未经过模型调用验证。{open ? '可选择上游返回的型号,目录、连接和自动池不设本地数量上限。' : `目录最多${preview.limits.catalog}项,本机最多${selectionLimit}个模型连接;单个自动池最多${poolLimit}个成员。`}</p>
<div className="mc-row-actions"><button className="button secondary" disabled={locked || !selectable.length || new Set([...chosen, ...selectable.map(value => value.id)]).size > selectionLimit} onClick={() => setChosen([...new Set([...chosen, ...selectable.map(value => value.id)])])}>选中当前筛选</button><button className="button secondary" disabled={locked || !chosen.length} onClick={() => setChosen([])}>清空选择</button></div>
<div className="mc-catalog-list" aria-label="上游模型列表">
{visible.map(value => <label className={'mc-catalog-model' + (chosen.includes(value.id) ? ' is-selected' : '')} key={value.id}>
<input type="checkbox" aria-label={'选择模型 ' + value.id} checked={chosen.includes(value.id)} disabled={locked || value.lifecycle === 'retired' || !chosen.includes(value.id) && chosen.length >= 100} onChange={event => setChosen(event.target.checked ? [...chosen, value.id] : chosen.filter(id => id !== value.id))} />
<input type="checkbox" aria-label={'选择模型 ' + value.id} checked={chosen.includes(value.id)} disabled={locked || !open && value.lifecycle === 'retired' || !chosen.includes(value.id) && chosen.length >= selectionLimit} onChange={event => setChosen(event.target.checked ? [...chosen, value.id] : chosen.filter(id => id !== value.id))} />
<span><strong>{value.id}</strong>{value.name !== value.id && <span>{value.name}</span>}<small>{[value.owner, value.contextLimit && `上下文 ${value.contextLimit.toLocaleString()} tokens`, value.maxOutputTokens && `输出上限 ${value.maxOutputTokens.toLocaleString()}`, value.lifecycle && value.lifecycle !== 'active' && (value.lifecycle === 'retired' ? '已退役' : '待退役')].filter(Boolean).join(' · ') || '上游未提供详细元数据'}</small>
<small>{Object.entries(value.capabilityDeclarations).filter(([, state]) => state !== 'unknown').map(([capability, state]) => `${capabilityNames[capability]}${state === 'supported' ? '支持' : '不支持'}`).join(' · ') || '文本、工具、流式等能力待确认'}{value.efforts.length ? ` · 推理强度 ${value.efforts.join(' / ')}` : ''}</small></span>
</label>)}{!visible.length && <p className="mc-empty">{preview.entries.length ? '没有匹配的型号。可更改搜索条件。' : '上游返回了空目录。可核对连接或使用手动兼容入口。'}</p>}
@@ -99,7 +101,7 @@ export function ModelCatalog({ sources, sourceId = '', busy, onSaved, onClose }:
<div className="mc-form-grid"><label>保存后的使用方式<select aria-label="模型使用方式" value={routing} disabled={locked} onChange={event => setRouting(event.target.value)}><option value="keep">保留当前选择,稍后手动使用</option><option value="manual">手动指定默认模型</option><option value="auto">自动适配所选模型</option></select></label>
{routing === 'manual' && <label>默认模型<select aria-label="目录默认模型" value={defaultModel} disabled={locked} onChange={event => setDefaultModel(event.target.value)}><option value="">请选择型号</option>{chosen.map(id => <option key={id}>{id}</option>)}</select></label>}</div>
{routing === 'auto' && <p className="mc-help">自动适配复用模型池,按任务所需能力、连接健康和可用并发筛选,再按轮询分配;同一运行优先保持型号。未确认能力的型号不会用于需要该能力的任务。</p>}
<div className="mc-actions"><button className="button primary" disabled={locked || !chosen.length || routing === 'manual' && !chosen.includes(defaultModel) || routing === 'auto' && chosen.length > 32} onClick={() => void save()}>{saving ? '正在保存…' : `保存所选 ${chosen.length} 个模型`}</button></div>
<div className="mc-actions"><button className="button primary" disabled={locked || !chosen.length || routing === 'manual' && !chosen.includes(defaultModel) || routing === 'auto' && chosen.length > poolLimit} onClick={() => void save()}>{saving ? '正在保存…' : `保存所选 ${chosen.length} 个模型`}</button></div>
</>}
</section>;
}
+5 -5
View File
@@ -7,11 +7,11 @@ type Connection = { id: string; name: string; baseUrl: string; revision: number
type Trial = { mode: string; status: string; stage: string; address?: string; family?: string; code?: string; tcpMs?: number; tlsMs?: number;
tls?: string; tlsProtocol?: string; certificateAuthorized?: boolean; attempts: { address: string; code?: string }[] };
type Job = { id: string; connectionId: string; connectionRevision: number; connectionName: string; status: string; startedAt: string; finishedAt: string | null;
stale: boolean; code?: string; elapsedMs: number; budgetMs: number; target: { endpoint: string; host: string; port: number; scheme: string };
stale: boolean; code?: string; elapsedMs: number; budgetMs: number; stageTimeoutMs?: number; target: { endpoint: string; host: string; port: number; scheme: string };
transport: { autoSelectFamily: boolean; familyAttemptTimeoutMs: number; connectTimeoutMs: number };
route: { proxyConfigured: boolean; noProxyConfigured: boolean; customTransport: boolean };
stages: { dns?: { status: string; elapsedMs?: number; code?: string; addresses?: { address: string; family: number }[] } }; trials: Trial[] };
type View = { jobs: Job[]; active: number; retained: number };
type View = { jobs: Job[]; active: number; retained: number | null };
const labels: Record<string, string> = { passed: '通过', partial: '部分路径可连接', failed: '未通过', running: '检查中', pending: '等待',
cancelled: '已停止', interrupted: '已中断', skipped: '未检查' };
const reasons: Record<string, string> = { ENOTFOUND: '域名没有解析结果', EAI_AGAIN: 'DNS 暂时不可用', DNS_NO_ADDRESSES: '没有可用的 IP 地址',
@@ -65,7 +65,7 @@ export function ModelNetworkDiagnostics({ connections, initialId, disabled }: {
})}><Square size={14} />停止诊断</button>}
</div>
{selected && <p className="mn-endpoint">{selected.baseUrl} <span>· 配置修订 {selected.revision}</span></p>}
<p className="mn-scope"><CircleHelp size={16} /><span>本次只检查端点直连路径,保留证书校验;握手通过不能证明 Key、型号或模型能力可用。检查最多约 12 秒,离开后结果保留。</span></p>
<p className="mn-scope"><CircleHelp size={16} /><span>本次只检查端点直连路径,保留证书校验;握手通过不能证明 Key、型号或模型能力可用。可随时停止检查,离开后结果保留。</span></p>
{error && <p className="mn-error" role="alert">{error}</p>}
{activeJob && activeJob.connectionId !== connectionId && <p className="mn-scope">{activeJob.connectionName} 正在检查。<button type="button" className="mn-link" onClick={() => { setConnectionId(activeJob.connectionId); setFocused(activeJob.id); }}>查看正在运行的诊断</button></p>}
{!view ? <p className="mc-empty">正在读取诊断记录…</p> : <div className="mn-workspace">
@@ -86,11 +86,11 @@ export function ModelNetworkDiagnostics({ connections, initialId, disabled }: {
{trial.code && <small>{detail(trial.code)}</small>}{trial.attempts.some(value => value.code) && <small>候选地址失败:{trial.attempts.filter(value => value.code).map(value => value.address + ' · ' + value.code).join(';')}</small>}</td></tr>)}</tbody></table>
{job.code && <p className="mn-outcome">{detail(job.code)}</p>}
<details className="mn-transport"><summary>查看原诊断范围与运输参数</summary><dl><dt>原端点</dt><dd>{job.target.endpoint}</dd><dt>检查目标</dt><dd>{job.target.host}:{job.target.port}</dd>
<dt>自动地址族</dt><dd>{job.transport.autoSelectFamily ? '开启' : '关闭'} · 候选间隔 {job.transport.familyAttemptTimeoutMs} ms</dd><dt>连接 / 总时限</dt><dd>{job.transport.connectTimeoutMs} / {job.budgetMs} ms</dd>
<dt>自动地址族</dt><dd>{job.transport.autoSelectFamily ? '开启' : '关闭'} · 候选间隔 {job.transport.familyAttemptTimeoutMs} ms</dd><dt>单路径 / 总时限</dt><dd>{(job.stageTimeoutMs ?? job.transport.connectTimeoutMs) > 0 ? (job.stageTimeoutMs ?? job.transport.connectTimeoutMs) + ' ms' : '不限'} / {job.budgetMs ? job.budgetMs + ' ms' : '不限'}</dd>
<dt>模型 API</dt><dd>未请求;能力与连接健康结论保持原记录</dd><dt>记录</dt><dd>{job.id}</dd></dl></details>
</>}
</div>
<aside className="mn-history" aria-label="连接诊断历史"><h4><History size={16} />近期检查</h4><p>保存最近 {view.retained} 条;点击查看原记录。</p>
<aside className="mn-history" aria-label="连接诊断历史"><h4><History size={16} />近期检查</h4><p>{view.retained === null ? '保留全部检查记录。' : `保存最近 ${view.retained} 条。`}点击查看原记录。</p>
{!jobs.length && <p>这条连接还没有检查记录。</p>}{jobs.map(value => <button key={value.id} type="button" aria-pressed={job?.id === value.id} onClick={() => setFocused(value.id)}><span>{new Date(value.startedAt).toLocaleString()}</span><strong>{labels[value.status] ?? value.status}{value.stale ? ' · 旧配置' : ''}</strong><small>修订 {value.connectionRevision} · {duration(value.elapsedMs)}</small></button>)}
</aside>
</div>}
+4 -4
View File
@@ -6,13 +6,13 @@ export function ModelWaitSettings({ value, disabled, onSave }: { value: WaitSett
const [responseSeconds, setResponseSeconds] = useState(value.modelResponseTimeoutMs / 1000);
const [idleSeconds, setIdleSeconds] = useState(value.modelStreamIdleTimeoutMs / 1000);
return <form className="mc-editor" aria-label="模型等待时限" onSubmit={event => { event.preventDefault(); onSave({ modelResponseTimeoutMs: responseSeconds * 1000, modelStreamIdleTimeoutMs: idleSeconds * 1000 }); }}>
<h3>给模型足够时间,保留等待边界。</h3>
<h3>模型等待时间</h3>
<p>适用于原模型连接及模型池内的每次请求;从下一次运行生效。保存只调整等待时限,保留当前模型池和连接。</p>
<div className="mc-form-grid">
<label>单次模型响应上限(秒)<input aria-label="单次模型响应上限(秒)" type="number" min={15} max={900} step={1} required value={responseSeconds} disabled={disabled} onChange={event => setResponseSeconds(Number(event.target.value))} /><small>包含服务排队与生成。默认 300 秒,最多 900 秒。</small></label>
<label>流式无数据上限(秒)<input aria-label="流式无数据上限(秒)" type="number" min={5} max={300} step={1} required value={idleSeconds} disabled={disabled} onChange={event => setIdleSeconds(Number(event.target.value))} /><small>开始流式响应后连续没有新数据的等待时间。默认 120 秒。</small></label>
<label>单次模型响应上限(秒)<input aria-label="单次模型响应上限(秒)" type="number" min={0} step={1} required value={responseSeconds} disabled={disabled} onChange={event => setResponseSeconds(Number(event.target.value))} /><small>默认 0=不限,包含服务排队与生成;可自行填写等待秒数。</small></label>
<label>流式无数据上限(秒)<input aria-label="流式无数据上限(秒)" type="number" min={0} step={1} required value={idleSeconds} disabled={disabled} onChange={event => setIdleSeconds(Number(event.target.value))} /><small>默认 0=不限。可设置开始流式响应后连续没有新数据的等待秒数。</small></label>
</div>
<p>持续收到数据仍受单次响应上限约束。停止任务立即生效;任务总预算先到时会暂停。不完整的文件或命令参数不会执行。</p>
<p>仅在填写正数时使用相应时限;0 不附加本地等待期限。你可以随时停止任务,上游原始错误和实际用量会保留。</p>
<div className="mc-actions"><button type="submit" className="button primary" disabled={disabled}>保存等待时限</button></div>
</form>;
}