feat(models): persist explicitly saved credentials with user-scoped DPAPI
This commit is contained in:
+57
-12
@@ -1,16 +1,19 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { Activity, Check, CircleHelp, Layers3, Plus, Power, RefreshCw, Route, Server, Settings2 } from 'lucide-react';
|
||||
import { Activity, Check, CircleHelp, KeyRound, Layers3, Plus, Power, RefreshCw, Route, Server, Settings2 } from 'lucide-react';
|
||||
import { api } from './api';
|
||||
import type { Config } from './types';
|
||||
import './ModelCenter.css';
|
||||
|
||||
type Connection = { id: string; name: string; brand: string; protocol: string; baseUrl: string; model: string; enabled: boolean; revision: number; hasKey: boolean;
|
||||
requiresKey: boolean; contextLimit: number; maxOutputTokens: number; concurrency: number; status: string; activeRequests: number; health: { state: string; reason?: string; cooldownUntil?: number } };
|
||||
requiresKey: boolean; contextLimit: number; maxOutputTokens: number; concurrency: number; status: string; activeRequests: number; savedCredential?: { status: string }; health: { state: string; reason?: string; cooldownUntil?: number } };
|
||||
type Pool = { id?: string; name: string; members: { connectionId: string; weight: number }[]; strategy: string; sticky: boolean; maxAttempts: number; revision?: number; queueTimeoutMs: number };
|
||||
type Attempt = { id: string; connectionId: string; poolId: string | null; model: string; status: string; startedAt: string; ordinal: number; usageStatus: string; reason?: string; taskId?: string; runId: string; requestArtifactId?: string; usage?: { prompt_tokens?: number; completion_tokens?: number } };
|
||||
type ImportRecord = { id: string; source: string; path: string; enabled: boolean; lastCheckedAt?: string; lastSyncedAt?: string; lastError?: string; lastResult?: { imported?: number; conflicts?: string[] } };
|
||||
type Center = { revision: number; selected: { type: string; id: string }; connections: Connection[]; pools: Pool[]; imports: ImportRecord[]; attempts: Attempt[]; waiting: number };
|
||||
type Operations = { checkedAt: string; version: string; scope: string; activeTasks: number; queue: number; checks: { id: string; title: string; status: string; detail: string }[] };
|
||||
type SavedCredential = { id: string; name: string; revision: number; status: string; enabled?: boolean; savedAt?: string; message: string };
|
||||
type CredentialView = { supported: boolean; unavailable: boolean; connections: SavedCredential[]; scope: string };
|
||||
const savedStates: Record<string, string> = { not_saved: '仅本次内存', saved: '本机加密保存', disabled: '关闭自动加载', source_changed: '配置已变化', decrypt_failed: '无法解密', user_mismatch: '用户不匹配', directory_mismatch: '目录不匹配', unavailable: '保存登记不可用' };
|
||||
const states: Record<string, string> = { configured: '已配置', needs_key: '待填凭据', disabled: '已停用', needs_attention: '需要处理', cooling: '冷却中', completed: '收到响应', failed: '失败', running: '请求中', unknown: '结果待核对', interrupted: '已中断', passed: '通过', attention: '待配置' };
|
||||
const initial = { name: '', brand: '自定义', model: '', baseUrl: 'https://api.openai.com/v1', requiresKey: true, enabled: true, contextLimit: 16000, maxOutputTokens: 2048, concurrency: 1 };
|
||||
const emptyPool: Pool = { name: '', members: [], strategy: 'round-robin', sticky: true, maxAttempts: 3, queueTimeoutMs: 15000 };
|
||||
@@ -19,6 +22,8 @@ export function ModelCenter({ onConfig, onLegacy, busy }: { onConfig: (value: Co
|
||||
const [tab, setTab] = useState('connections');
|
||||
const [draft, setDraft] = useState<typeof initial & { id?: string; revision?: number }>(initial);
|
||||
const [editing, setEditing] = useState(false), [key, setKey] = useState('');
|
||||
const [persistKey, setPersistKey] = useState(false), [persistImports, setPersistImports] = useState(false);
|
||||
const [credentialView, setCredentialView] = useState<CredentialView | null>(null), [credentialKey, setCredentialKey] = useState(''), [credentialTarget, setCredentialTarget] = useState('');
|
||||
const [pool, setPool] = useState<Pool>(emptyPool), [poolEditing, setPoolEditing] = useState(false);
|
||||
const [working, setWorking] = useState(false), [notice, setNotice] = useState('');
|
||||
const [operations, setOperations] = useState<Operations | null>(null), [autoInspect, setAutoInspect] = useState(false);
|
||||
@@ -26,40 +31,51 @@ export function ModelCenter({ onConfig, onLegacy, busy }: { onConfig: (value: Co
|
||||
const [preview, setPreview] = useState<{ id: string; entries: { id: string; name: string; model: string; baseUrl: string; hasKey: boolean }[]; notices: string[] } | null>(null);
|
||||
const [discovery, setDiscovery] = useState<{ source: string; path: string; available: boolean; supported: boolean; detail?: string }[]>([]);
|
||||
const alive = useRef(true), generation = useRef(0);
|
||||
const tabsRef = useRef<HTMLElement>(null);
|
||||
async function refresh() { const marker = ++generation.current; const result = await api<Center>('/model-center'); if (alive.current && marker === generation.current) setView(result); }
|
||||
async function act(action: () => Promise<void>) {
|
||||
setWorking(true); setNotice('');
|
||||
try { await action(); if (alive.current) await refresh(); }
|
||||
try { await action(); if (alive.current) { await refresh(); if (credentialView) await refreshCredentials(); } }
|
||||
catch (cause) { if (alive.current) setNotice(cause instanceof Error ? cause.message : '操作未完成,请刷新核对。'); }
|
||||
finally { if (alive.current) setWorking(false); }
|
||||
}
|
||||
async function inspect() { const value = await api<Operations>('/operations'); if (alive.current) setOperations(value); }
|
||||
async function refreshCredentials() { const value = await api<CredentialView>('/model-center/credentials'); if (alive.current) setCredentialView(value); }
|
||||
useEffect(() => { alive.current = true; void refresh().catch(error => { if (alive.current) setNotice(error.message); }); return () => { alive.current = false; generation.current++; }; }, []);
|
||||
useEffect(() => { if (!autoInspect || tab !== 'operations') return; const timer = window.setInterval(() => { void inspect().catch(error => { if (alive.current) setNotice(error.message); }); }, 30000); return () => window.clearInterval(timer); }, [autoInspect, tab]);
|
||||
useEffect(() => { setCredentialKey(''); if (tab === 'credentials') void refreshCredentials().catch(error => { if (alive.current) setNotice(error.message); }); }, [tab]);
|
||||
useEffect(() => {
|
||||
const ensureVisible = () => { const nav = tabsRef.current, button = nav?.querySelector<HTMLButtonElement>('button[aria-current]'); if (!nav || !button) return;
|
||||
const area = nav.getBoundingClientRect(), target = button.getBoundingClientRect(), start = target.left - area.left;
|
||||
if (start < 0) nav.scrollLeft += start - 12; else if (start + target.width > nav.clientWidth) nav.scrollLeft += start + target.width - nav.clientWidth + 12;
|
||||
};
|
||||
const frame = requestAnimationFrame(ensureVisible); window.addEventListener('resize', ensureVisible);
|
||||
return () => { cancelAnimationFrame(frame); window.removeEventListener('resize', ensureVisible); };
|
||||
}, [tab]);
|
||||
const selected = view?.selected;
|
||||
const selectionName = selected?.type === 'pool' ? view?.pools.find(value => value.id === selected.id)?.name : view?.connections.find(value => value.id === selected?.id)?.name;
|
||||
const locked = working || busy;
|
||||
return <section className="model-center" aria-label="模型控制台" aria-busy={working}>
|
||||
<div className="mc-overview"><div><span className="mc-eyebrow">MODEL CONTROL</span><h2>连接有序,执行有据。</h2><p>统一管理模型服务、调度和每次真实请求。</p></div><div className="mc-current"><Route size={18} /><span>当前路由<strong>{selectionName || '原模型连接'}</strong></span><span className="mc-count">{view?.waiting ?? 0} 等待</span></div></div>
|
||||
<nav className="mc-tabs" aria-label="模型中心分类">{[['connections', '模型连接', Server], ['pools', '模型池', Layers3], ['attempts', '请求账本', Route], ['imports', '配置导入', Settings2], ['operations', '运行巡检', Activity]].map(([id, title, Icon]) => {
|
||||
<nav ref={tabsRef} className="mc-tabs" aria-label="模型中心分类">{[['connections', '模型连接', Server], ['pools', '模型池', Layers3], ['attempts', '请求账本', Route], ['imports', '配置导入', Settings2], ['credentials', '凭据保存', KeyRound], ['operations', '运行巡检', Activity]].map(([id, title, Icon]) => {
|
||||
const Symbol = Icon as typeof Server; return <button key={id as string} type="button" aria-current={tab === id ? 'page' : undefined} onClick={() => { setTab(id as string); setNotice(''); }}><Symbol size={16} />{title as string}</button>;
|
||||
})}<button className="mc-refresh" type="button" disabled={working} onClick={() => void act(refresh)} aria-label="刷新模型中心"><RefreshCw size={16} /></button></nav>
|
||||
{notice && <div className="mc-notice" role="status">{notice}</div>}
|
||||
{busy && <p className="mc-notice">有任务正在执行;连接可停用,其他配置请在任务结束后修改。</p>}
|
||||
{!view ? <p className="mc-empty">正在读取实际连接状态…</p> : <div className="mc-content">
|
||||
{tab === 'connections' && <>
|
||||
<div className="mc-section-title"><div><h3>模型连接</h3><p>凭据仅在本次宿主内存中使用。已配置与调用通过分别显示。</p></div><button className="button primary" disabled={locked} onClick={() => { setDraft(initial); setKey(''); setEditing(true); }}><Plus size={16} />添加连接</button></div>
|
||||
<div className="mc-section-title"><div><h3>模型连接</h3><p>默认仅在本次宿主内存中使用;可在凭据保存中选择本机加密。已配置与调用通过分别显示。</p></div><button className="button primary" disabled={locked} onClick={() => { setDraft(initial); setKey(''); setPersistKey(false); setEditing(true); }}><Plus size={16} />添加连接</button></div>
|
||||
<div className="mc-connections">{view.connections.map(value => <article className={'mc-connection ' + (!value.enabled ? 'mc-disabled' : '')} key={value.id}>
|
||||
<div className="mc-card-heading"><span className="mc-service-icon"><Server size={20} /></span><div><h4>{value.name}</h4><span>{value.brand} · Chat Completions</span></div><span className={'mc-state mc-state-' + value.status}>{states[value.status]}</span></div>
|
||||
<dl><dt>模型</dt><dd>{value.model || '尚未填写'}</dd><dt>接口</dt><dd>{value.baseUrl}</dd><dt>临时凭据</dt><dd>{value.hasKey ? '已设置,重启需重新填写' : value.requiresKey ? '尚未填写' : '此服务可不填'}</dd><dt>请求 / 容量</dt><dd>{value.activeRequests} 在途 · 并发 {value.concurrency} · 上下文 {value.contextLimit.toLocaleString()}</dd></dl>
|
||||
<dl><dt>模型</dt><dd>{value.model || '尚未填写'}</dd><dt>接口</dt><dd>{value.baseUrl}</dd><dt>凭据</dt><dd>{value.hasKey ? value.savedCredential?.status === 'saved' ? '已设置,可从本机加密保存加载' : '已设置,重启需重新填写' : value.requiresKey ? '尚未填写' : '此服务可不填'}</dd><dt>请求 / 容量</dt><dd>{value.activeRequests} 在途 · 并发 {value.concurrency} · 上下文 {value.contextLimit.toLocaleString()}</dd></dl>
|
||||
<div className="mc-capabilities"><span>工具:协议声明</span><span>视觉 / 语音:待验证</span></div>
|
||||
{value.health.reason && <p className="mc-card-warning">{value.health.reason}{!!value.health.cooldownUntil && value.health.cooldownUntil > Date.now() && ' · 冷却至 ' + new Date(value.health.cooldownUntil).toLocaleTimeString()}</p>}
|
||||
<footer><button className="button secondary" disabled={locked || !value.enabled} onClick={() => void act(async () => { const result = await api<{ config: Config }>('/model-center/select', { type: value.id === 'legacy-default' ? 'legacy' : 'connection', id: value.id }); if (alive.current) onConfig(result.config); })}>{selected?.id === value.id ? <Check size={14} /> : <Route size={14} />}{selected?.id === value.id ? '当前使用' : '用于新任务'}</button>
|
||||
<button className="button secondary" disabled={locked} onClick={() => { if (value.id === 'legacy-default') { onLegacy(); return; } setDraft(value); setKey(''); setEditing(true); }}>编辑</button>
|
||||
<button className="button secondary" disabled={locked} onClick={() => { if (value.id === 'legacy-default') { onLegacy(); return; } setDraft(value); setKey(''); setPersistKey(false); setEditing(true); }}>编辑</button>
|
||||
{value.id !== 'legacy-default' && <button className="mc-icon-action" aria-label={(value.enabled ? '停用' : '启用') + value.name} disabled={working} onClick={() => void act(async () => { await api('/model-center/toggle', { id: value.id, enabled: !value.enabled }); })}><Power size={15} />{value.enabled ? '停用' : '启用'}</button>}
|
||||
<button className="mc-probe" disabled={locked || !value.enabled} onClick={() => void act(async () => { await api('/model-center/probe', { id: value.id }); if (alive.current) setNotice('该连接已收到实际响应;请求与用量已记入账本。'); })}>验证响应(调用模型)</button></footer>
|
||||
</article>)}</div>
|
||||
{editing && <form className="mc-editor" aria-label="编辑模型连接" onSubmit={event => { event.preventDefault(); void act(async () => { await api('/model-center/connections', { ...draft, ...(key ? { apiKey: key } : {}) }); if (alive.current) { setKey(''); setEditing(false); setNotice('连接已保存。'); } }); }}>
|
||||
{editing && <form className="mc-editor" aria-label="编辑模型连接" onSubmit={event => { event.preventDefault(); void act(async () => { await api('/model-center/connections', { ...draft, ...(key ? { apiKey: key } : {}), ...(persistKey ? { persistKey: true } : {}) }); if (alive.current) { setKey(''); setEditing(false); setNotice(persistKey ? '连接与本机加密凭据已一起保存。' : '连接已保存。'); } }); }}>
|
||||
<h3>{draft.id ? '编辑模型连接' : '添加模型连接'}</h3><div className="mc-form-grid">
|
||||
<label>连接名称<input required value={draft.name} onChange={event => setDraft({ ...draft, name: event.target.value })} /></label>
|
||||
<label>服务品牌<select value={draft.brand} onChange={event => setDraft({ ...draft, brand: event.target.value })}>{['自定义', 'OpenAI', 'Claude 兼容代理', 'DeepSeek', 'Ollama', 'vLLM', '兼容服务'].map(brand => <option key={brand}>{brand}</option>)}</select></label>
|
||||
@@ -70,11 +86,40 @@ export function ModelCenter({ onConfig, onLegacy, busy }: { onConfig: (value: Co
|
||||
<label>输出上限<input type="number" min="256" max="16000" value={draft.maxOutputTokens} onChange={event => setDraft({ ...draft, maxOutputTokens: Number(event.target.value) })} /></label>
|
||||
<label>并发请求上限<input type="number" min="1" max="8" value={draft.concurrency} onChange={event => setDraft({ ...draft, concurrency: Number(event.target.value) })} /></label>
|
||||
<label className="mc-checkbox"><input type="checkbox" checked={draft.requiresKey} onChange={event => setDraft({ ...draft, requiresKey: event.target.checked })} />服务需要 API Key</label></div>
|
||||
<p className="mc-help"><CircleHelp size={14} />选择品牌仅用于分类;接口需要提供兼容的 Chat Completions 协议。</p>
|
||||
<div className="mc-actions"><button className="button secondary" type="button" onClick={() => { setEditing(false); setKey(''); }}>取消</button><button className="button primary" disabled={locked} type="submit">保存模型连接</button></div>
|
||||
<label className="mc-checkbox"><input type="checkbox" checked={persistKey} onChange={event => setPersistKey(event.target.checked)} />本机加密保存本次填写的 API Key</label>
|
||||
<p className="mc-help"><CircleHelp size={14} />加密保存需要新填凭据;配置变化后需重新保存。选择品牌仅用于分类,接口需提供 Chat Completions 协议。</p>
|
||||
<div className="mc-actions"><button className="button secondary" type="button" onClick={() => { setEditing(false); setKey(''); }}>取消</button><button className="button primary" disabled={locked || persistKey && !key.trim()} type="submit">保存模型连接</button></div>
|
||||
</form>}
|
||||
</>}
|
||||
{tab === 'pools' && <><div className="mc-section-title"><div><h3>模型池</h3><p>按能力、临时凭据、健康和并发选择成员,切换保留已完成操作。</p></div><button className="button primary" disabled={locked} onClick={() => { setPool(emptyPool); setPoolEditing(true); }}><Plus size={16} />新建模型池</button></div>
|
||||
{tab === 'credentials' && <section aria-label="本机加密凭据">
|
||||
<div className="mc-section-title"><div><h3>本机加密凭据</h3><p>使用当前Windows用户加密。保存后的 Key 不会回显或包含在导出中。</p></div></div>
|
||||
{!credentialView ? <p className="mc-empty">正在核对本机保存状态…</p> : <>
|
||||
<p className="mc-help">只保存这次填写或确认导入的凭据。临时连接在宿主退出后需要重新填写。</p>
|
||||
{credentialView.unavailable && <p className="mc-card-warning">原保存登记格式不可用;原数据保留,请核对后修复。</p>}
|
||||
<form className="mc-editor" aria-label="保存加密凭据" onSubmit={event => { event.preventDefault(); void act(async () => {
|
||||
const target = view.connections.find(value => value.id === (credentialTarget || view.connections[0]?.id));
|
||||
if (!target) return;
|
||||
const result = await api<{ config: Config }>('/model-center/credentials', { id: target.id, revision: target.revision, action: 'save', apiKey: credentialKey });
|
||||
if (alive.current) { setCredentialKey(''); setNotice('本机加密凭据已保存;宿主重启后按原连接身份加载。'); onConfig(result.config); }
|
||||
}); }}>
|
||||
<div className="mc-form-grid"><label>选择保存连接<select aria-label="选择保存连接" value={credentialTarget || view.connections[0]?.id || ''} onChange={event => { setCredentialTarget(event.target.value); setCredentialKey(''); }}>{view.connections.map(value => <option key={value.id} value={value.id}>{value.name} · {value.model || '未填写模型'}</option>)}</select></label>
|
||||
<label>重新填写 API Key<input type="password" autoComplete="off" value={credentialKey} onChange={event => setCredentialKey(event.target.value)} /></label></div>
|
||||
<p className="mc-help">只保存这次新填的凭据。不同用户、目录或连接配置无法加载原保存块。</p>
|
||||
<div className="mc-actions"><button type="submit" className="button primary" disabled={locked || !credentialView.supported || credentialView.unavailable || !credentialKey.trim()}>加密保存凭据</button></div>
|
||||
</form>
|
||||
<div className="mc-connections">{credentialView.connections.map(value => <article className="mc-connection" key={value.id}>
|
||||
<div className="mc-card-heading"><KeyRound size={20} /><div><h4>{value.name}</h4><span>{savedStates[value.status] || value.status}</span></div></div>
|
||||
<p className="mc-help">{value.message}</p>{value.savedAt && <p className="mc-help">保存于 {new Date(value.savedAt).toLocaleString()}</p>}
|
||||
<div className="mc-actions">{value.status !== 'not_saved' && <>
|
||||
<button className="button secondary" disabled={locked} onClick={() => void act(async () => { await api('/model-center/credentials', { id: value.id, revision: value.revision, action: value.enabled ? 'disable' : 'enable' }); })}>{value.enabled ? '关闭自动加载' : '启用自动加载'}</button>
|
||||
<button className="button secondary" disabled={locked} onClick={() => void act(async () => { await api('/model-center/credentials', { id: value.id, revision: value.revision, action: 'delete' }); })}>删除本机保存</button>
|
||||
</>}
|
||||
<button className="button secondary" disabled={locked} onClick={() => void act(async () => { const result = await api<{ config: Config }>('/model-center/credentials', { id: value.id, revision: value.revision, action: 'forget' }); if (alive.current) onConfig(result.config); })}>清除该连接凭据</button>
|
||||
</div>
|
||||
</article>)}</div><p className="mc-help">删除本机保存保留本次内存连接;清除该连接凭据会同时移除本机保存与内存凭据。</p>
|
||||
</>}
|
||||
</section>}
|
||||
{tab === 'pools' && <><div className="mc-section-title"><div><h3>模型池</h3><p>按能力、凭据、健康和并发选择成员,切换保留已完成操作。</p></div><button className="button primary" disabled={locked} onClick={() => { setPool(emptyPool); setPoolEditing(true); }}><Plus size={16} />新建模型池</button></div>
|
||||
{!view.pools.length && <p className="mc-empty">添加多个连接后建立模型池,设置轮询与故障切换规则。</p>}
|
||||
{view.pools.map(value => <article className="mc-pool" key={value.id}><Layers3 size={23} /><div><h4>{value.name}</h4><p>{value.strategy === 'weighted' ? '权重轮询' : '顺序轮询'} · {value.members.length} 个成员 · {value.maxAttempts} 次尝试上限 · {value.sticky ? '运行内保持连接' : '每次请求重新选择'}</p><div className="mc-members">{value.members.map(member => <span key={member.connectionId}>{view.connections.find(connection => connection.id === member.connectionId)?.name} ×{member.weight}</span>)}</div></div><div className="mc-actions"><button className="button secondary" disabled={locked} onClick={() => { setPool(value); setPoolEditing(true); }}>编辑</button><button className="button primary" disabled={locked} onClick={() => void act(async () => { const result = await api<{ config: Config }>('/model-center/select', { type: 'pool', id: value.id }); if (alive.current) onConfig(result.config); })}>{selected?.id === value.id ? '当前模型池' : '使用此模型池'}</button></div></article>)}
|
||||
{poolEditing && <form className="mc-editor" aria-label="编辑模型池" onSubmit={event => { event.preventDefault(); void act(async () => { await api('/model-center/pools', pool); if (alive.current) setPoolEditing(false); }); }}><h3>模型池规则</h3><div className="mc-form-grid"><label>模型池名称<input required value={pool.name} onChange={event => setPool({ ...pool, name: event.target.value })} /></label><label>调度策略<select value={pool.strategy} onChange={event => setPool({ ...pool, strategy: event.target.value })}><option value="round-robin">顺序轮询</option><option value="weighted">权重轮询</option></select></label><label>单请求尝试上限<input type="number" min="1" max="8" value={pool.maxAttempts} onChange={event => setPool({ ...pool, maxAttempts: Number(event.target.value) })} /></label><label>排队上限(秒)<input type="number" min="1" max="60" value={pool.queueTimeoutMs / 1000} onChange={event => setPool({ ...pool, queueTimeoutMs: Number(event.target.value) * 1000 })} /></label></div><label className="mc-checkbox"><input type="checkbox" checked={pool.sticky} onChange={event => setPool({ ...pool, sticky: event.target.checked })} />同一运行优先保持连接;明确失败后才切换</label>
|
||||
@@ -86,7 +131,7 @@ export function ModelCenter({ onConfig, onLegacy, busy }: { onConfig: (value: Co
|
||||
{view.imports.length > 0 && <><h4>已登记来源</h4>{view.imports.map(value => <article className="mc-import-source" key={value.id}><strong>{value.source}</strong><code>{value.path}</code><span>{value.enabled ? '每分钟检查' : '自动同步已关闭'}</span>{value.lastCheckedAt && <p>最近检查 {new Date(value.lastCheckedAt).toLocaleString()}</p>}{value.lastError && <p className="mc-card-warning">{value.lastError}</p>}{!!value.lastResult?.conflicts?.length && <p className="mc-card-warning">有 {value.lastResult.conflicts.length} 项与手动修改冲突,已保留工作台中的修改。</p>}<button className="button secondary" disabled={locked} onClick={() => void act(async () => { await api('/model-center/import-toggle', { id: value.id, enabled: !value.enabled }); })}>{value.enabled ? '关闭自动同步' : '启用自动同步'}</button></article>)}<button className="button secondary" disabled={locked || !view.imports.some(value => value.enabled)} onClick={() => void act(async () => { const result = await api<{ results: { imported?: string[]; conflicts?: string[]; error?: string }[] }>('/model-center/import-sync', {}); const imported = result.results.reduce((sum, value) => sum + (value.imported?.length ?? 0), 0); const conflicts = result.results.reduce((sum, value) => sum + (value.conflicts?.length ?? 0), 0); if (alive.current) setNotice(`已检查启用来源:更新 ${imported} 项,冲突 ${conflicts} 项。`); })}>立即同步已启用来源</button></>}
|
||||
{discovery.map(value => <article className="mc-import-source" key={value.source}><strong>{value.source}</strong><code>{value.path || '当前版本尚无可发现的配置路径'}</code><span>{value.available ? value.supported ? '可预览' : '当前不支持' : '未发现'}</span>{value.detail && <p>{value.detail}</p>}<button className="button secondary" disabled={!value.available || !value.supported || locked} onClick={() => { setImportSource(value.source); setImportPath(value.path); }}>选择来源</button></article>)}
|
||||
<div className="mc-editor"><div className="mc-form-grid"><label>配置格式<select value={importSource} onChange={event => setImportSource(event.target.value)}><option value="ccswitch">CCSwitch SQLite</option><option value="workbench-json">工作台连接 JSON</option></select></label><label>本地文件路径<input value={importPath} onChange={event => { setImportPath(event.target.value); setPreview(null); }} /></label></div><button className="button secondary" disabled={locked || !importPath} onClick={() => void act(async () => { const value = await api<typeof preview>('/model-center/import-preview', { source: importSource, path: importPath }); if (alive.current) setPreview(value); })}>预览可导入连接</button></div>
|
||||
{preview && <div className="mc-editor"><h3>本次预览</h3>{preview.entries.map(value => <p key={value.id}>{value.name} · {value.model} · {value.baseUrl} · {value.hasKey ? '含临时凭据' : '无凭据'}</p>)}{preview.notices.map((value, index) => <p className="mc-help" key={index}>{value}</p>)}<button className="button primary" disabled={locked || !preview.entries.length} onClick={() => void act(async () => { await api('/model-center/import-apply', { previewId: preview.id }); if (alive.current) { setPreview(null); setNotice('已导入可支持的连接。临时凭据只在本次宿主内存中。'); } })}>导入这些连接</button></div>}
|
||||
{preview && <div className="mc-editor"><h3>本次预览</h3>{preview.entries.map(value => <p key={value.id}>{value.name} · {value.model} · {value.baseUrl} · {value.hasKey ? '含临时凭据' : '无凭据'}</p>)}{preview.notices.map((value, index) => <p className="mc-help" key={index}>{value}</p>)}<label className="mc-checkbox"><input type="checkbox" checked={persistImports} onChange={event => setPersistImports(event.target.checked)} />本机加密保存本次确认导入的凭据</label><button className="button primary" disabled={locked || !preview.entries.length} onClick={() => void act(async () => { await api('/model-center/import-apply', { previewId: preview.id, persistCredentials: persistImports }); if (alive.current) { setPreview(null); setNotice(persistImports ? '连接与本次确认导入的加密凭据已共同保存。' : '已导入可支持的连接。临时凭据只在本次宿主内存中。'); } })}>导入这些连接</button></div>}
|
||||
</>}
|
||||
{tab === 'operations' && <><div className="mc-section-title"><div><h3>运行巡检</h3><p>核对真实宿主、数据与近期工件,不发送模型请求。</p></div><button className="button primary" disabled={working} onClick={() => void act(inspect)}><Activity size={15} />开始本地巡检</button></div><label className="mc-checkbox"><input type="checkbox" checked={autoInspect} onChange={event => setAutoInspect(event.target.checked)} />在此页面每30秒检查,离开即停止</label>{operations ? <><p className="mc-help">{new Date(operations.checkedAt).toLocaleString()} · v{operations.version} · {operations.activeTasks} 活动任务 · {operations.queue} 排队</p><div className="mc-checks">{operations.checks.map(value => <article key={value.id}><span className={'mc-state mc-state-' + value.status}>{states[value.status] || value.status}</span><div><h4>{value.title}</h4><p>{value.detail}</p></div></article>)}</div><p className="mc-help">{operations.scope}</p></> : <p className="mc-empty">执行一次本地检查,查看实际结果与检查范围。</p>}</>}
|
||||
</div>}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import path from 'node:path';
|
||||
import { execFileSync } from 'node:child_process';
|
||||
import { projectEnvironment } from '../process-environment.mjs';
|
||||
|
||||
export const credentialError = (message, code = 'CREDENTIAL_UNAVAILABLE', status = 409) => Object.assign(new Error(message), { code, status });
|
||||
|
||||
// The command and environment contain no credential. Both directions travel
|
||||
// over private pipes as ASCII frames; raw child output is never logged.
|
||||
function transform(action, bytes, entropy) {
|
||||
if (process.platform !== 'win32') throw credentialError('本机加密凭据仅支持Windows用户级DPAPI。', 'CREDENTIAL_PLATFORM_UNSUPPORTED');
|
||||
if (!Buffer.isBuffer(bytes) || bytes.length > 128000 || !Buffer.isBuffer(entropy) || entropy.length !== 32) throw credentialError('加密凭据输入无效。');
|
||||
const script = "$ErrorActionPreference='Stop';$ProgressPreference='SilentlyContinue';Add-Type -AssemblyName System.Security;"
|
||||
+ '$awbInput=[Console]::In.ReadToEnd()|ConvertFrom-Json;'
|
||||
+ '$awbBytes=[Convert]::FromBase64String($awbInput.bytes);$awbEntropy=[Convert]::FromBase64String($awbInput.entropy);'
|
||||
+ 'try{$awbOutput=[Security.Cryptography.ProtectedData]::' + action + '($awbBytes,$awbEntropy,[Security.Cryptography.DataProtectionScope]::CurrentUser);'
|
||||
+ '[Console]::Out.Write([Convert]::ToBase64String($awbOutput))}'
|
||||
+ 'finally{[Array]::Clear($awbBytes,0,$awbBytes.Length);[Array]::Clear($awbEntropy,0,$awbEntropy.Length);if($awbOutput){[Array]::Clear($awbOutput,0,$awbOutput.Length)}}';
|
||||
try {
|
||||
const output = execFileSync(path.join(process.env.SystemRoot || 'C:\\Windows', 'System32/WindowsPowerShell/v1.0/powershell.exe'),
|
||||
['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')],
|
||||
{ input: JSON.stringify({ bytes: bytes.toString('base64'), entropy: entropy.toString('base64') }), encoding: 'utf8',
|
||||
windowsHide: true, stdio: ['pipe', 'pipe', 'pipe'], timeout: 15000, maxBuffer: 256000, env: projectEnvironment() }).trim();
|
||||
if (!/^[A-Za-z0-9+/]+={0,2}$/.test(output) || output.length > 200000) throw new Error('Invalid response');
|
||||
return Buffer.from(output, 'base64');
|
||||
} catch { throw credentialError('本机加密凭据无法处理,请核对Windows用户、数据目录或保存块。'); }
|
||||
}
|
||||
export const protectCredential = (bytes, entropy) => transform('Protect', bytes, entropy);
|
||||
export const unprotectCredential = (bytes, entropy) => transform('Unprotect', bytes, entropy);
|
||||
@@ -67,7 +67,7 @@ export class ConfigImporter {
|
||||
this.previews.set(id, { source, path: path.resolve(filename), created: Date.now(), ...contents });
|
||||
return { id, entries: contents.entries.map(({ apiKey, sourceId, origin, ...value }, index) => ({ ...value, id: String(index), hasKey: !!apiKey })), notices: contents.notices, expiresInMs: 300000 };
|
||||
}
|
||||
apply(id, autoSync) {
|
||||
apply(id, autoSync, persistCredentials = false) {
|
||||
const preview = this.previews.get(id);
|
||||
if (!preview || Date.now() - preview.created > 300000) throw new Error('导入预览已过期,请重新预览。');
|
||||
const current = this.read(preview.source, preview.path);
|
||||
@@ -79,6 +79,7 @@ export class ConfigImporter {
|
||||
const previous = this.hub.state.connections.find(value => value.importOrigin === item.origin);
|
||||
if (previous && previous.importRevision !== previous.revision) { conflicts.push(previous.name); continue; }
|
||||
const value = this.hub.upsert({ ...(previous ?? {}), ...item, id: previous?.id, revision: previous?.revision, enabled: previous ? previous.enabled : true,
|
||||
persistKey: persistCredentials === true && !!item.apiKey,
|
||||
...(item.apiKey ? { apiKey: item.apiKey } : { apiKey: '' }) });
|
||||
const stored = this.hub.connection(value.id); stored.source = preview.source; stored.importOrigin = item.origin; stored.importRevision = stored.revision;
|
||||
imported.push(value.id);
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
import fs from 'node:fs';
|
||||
import { createHash } from 'node:crypto';
|
||||
import { canonicalHost } from '../../shared/contracts/desktop-host.mjs';
|
||||
import { observeWindowsProcess } from '../desktop/process-identity.mjs';
|
||||
import { assertLocalTree } from '../desktop/file-state.mjs';
|
||||
import { protectCredential, unprotectCredential, credentialError } from '../desktop/windows-dpapi.mjs';
|
||||
|
||||
const metadata = 'modelCredentials';
|
||||
const sha = value => createHash('sha256').update(value).digest('hex');
|
||||
const empty = () => ({ schema: 1, revision: 0, entries: {} });
|
||||
export class CredentialVault {
|
||||
constructor(store, provider, { protect = protectCredential, unprotect = unprotectCredential } = {}) {
|
||||
this.store = store; this.provider = provider; this.protect = protect; this.unprotect = unprotect; this.issues = new Map();
|
||||
assertLocalTree(store.directory); this.dataIdentity = sha(fs.realpathSync.native(store.directory).toLowerCase());
|
||||
this.userSid = process.platform === 'win32' ? observeWindowsProcess(process.pid).userSid : null;
|
||||
this.reload();
|
||||
}
|
||||
reload() {
|
||||
const state = this.store.storage.meta(metadata, empty());
|
||||
this.blocked = !state || state.schema !== 1 || !Number.isSafeInteger(state.revision) || !state.entries || typeof state.entries !== 'object' || Array.isArray(state.entries) || Object.keys(state.entries).length > 101;
|
||||
this.state = this.blocked ? empty() : state;
|
||||
}
|
||||
binding(connection) {
|
||||
return sha(JSON.stringify(canonicalHost({ app: 'agent-workbench', scope: 'Windows.CurrentUser', userSid: this.userSid,
|
||||
dataIdentity: this.dataIdentity, connectionId: connection.id, connectionRevision: connection.revision,
|
||||
protocol: connection.protocol, baseUrl: connection.baseUrl, model: connection.model, requiresKey: connection.requiresKey })));
|
||||
}
|
||||
status(connection) {
|
||||
if (this.blocked) return { status: 'unavailable', storage: 'windows-user-dpapi', message: '本机保存登记格式损坏或来自新版本,未覆盖原记录。' };
|
||||
const value = this.state.entries[connection.id];
|
||||
if (!value) return { status: 'not_saved', storage: 'memory', message: '当前凭据只在宿主内存中。' };
|
||||
const issue = value.userSid !== this.userSid ? 'user_mismatch' : value.dataIdentity !== this.dataIdentity ? 'directory_mismatch'
|
||||
: value.connectionRevision !== connection.revision || value.bindingSha256 !== this.binding(connection) ? 'source_changed'
|
||||
: this.issues.get(connection.id);
|
||||
return { storage: 'windows-user-dpapi', status: issue ?? (value.enabled ? 'saved' : 'disabled'), enabled: value.enabled === true,
|
||||
connectionRevision: value.connectionRevision, credentialRevision: value.credentialRevision, savedAt: value.savedAt,
|
||||
message: issue ? '原保存块无法用于当前连接;重新填写后保存,或删除原保存。' : value.enabled ? '当前Windows用户可在宿主重启后加载。' : '已关闭自动加载;本次内存连接保留。' };
|
||||
}
|
||||
view(hub) { return { supported: process.platform === 'win32', storage: 'windows-user-dpapi', revision: this.state.revision, unavailable: this.blocked,
|
||||
connections: hub.connections().map(connection => ({ id: connection.id, name: connection.name, revision: connection.revision, ...this.status(connection) })),
|
||||
scope: '仅处理用户明确新填或确认导入的凭据;不会提取原内存连接。密文与连接登记在同一SQLite事务提交。' }; }
|
||||
prepare(connection, explicitKey, credentialRevision) {
|
||||
if (this.blocked) throw credentialError('原保存登记无法核对;请保留原数据并修复登记后保存。');
|
||||
if (typeof explicitKey !== 'string' || !explicitKey.trim() || explicitKey.length > 16000) throw credentialError('加密保存需要重新填写API Key。', 'CREDENTIAL_INPUT_REQUIRED', 400);
|
||||
const bindingSha256 = this.binding(connection), plain = Buffer.from(JSON.stringify({ schema: 1, bindingSha256, credentialRevision, key: explicitKey.trim() }), 'utf8');
|
||||
let protectedBytes;
|
||||
try { protectedBytes = this.protect(plain, Buffer.from(bindingSha256, 'hex')); }
|
||||
finally { plain.fill(0); }
|
||||
try { return { schema: 1, connectionId: connection.id, connectionRevision: connection.revision, credentialRevision,
|
||||
userSid: this.userSid, dataIdentity: this.dataIdentity, bindingSha256, enabled: true, savedAt: new Date().toISOString(), ciphertext: protectedBytes.toString('base64') }; }
|
||||
finally { protectedBytes.fill(0); }
|
||||
}
|
||||
stage(id, record) {
|
||||
if (this.blocked) throw credentialError('本机保存登记无法核对。');
|
||||
this.state = structuredClone(this.state); this.state.revision++;
|
||||
if (record) this.state.entries[id] = record; else delete this.state.entries[id];
|
||||
this.store.storage.setMeta(metadata, this.state); this.issues.delete(id);
|
||||
}
|
||||
restore(hub) {
|
||||
for (const connection of hub.connections()) {
|
||||
const record = this.state.entries[connection.id]; if (!record || this.status(connection).status !== 'saved') continue;
|
||||
// Never overwrite or persist credentials already resident in this host.
|
||||
if (connection.id === 'legacy-default' ? this.provider.hasKey() : this.provider.credentials.has(connection.id)) continue;
|
||||
let plain;
|
||||
try {
|
||||
if (record.schema !== 1 || record.connectionId !== connection.id || !Number.isSafeInteger(record.credentialRevision) || record.credentialRevision < 1
|
||||
|| typeof record.ciphertext !== 'string' || record.ciphertext.length > 200000 || !/^[A-Za-z0-9+/]+={0,2}$/.test(record.ciphertext)) throw new Error('Invalid saved block');
|
||||
plain = this.unprotect(Buffer.from(record.ciphertext, 'base64'), Buffer.from(record.bindingSha256, 'hex'));
|
||||
const payload = JSON.parse(plain.toString('utf8'));
|
||||
if (payload.schema !== 1 || payload.bindingSha256 !== this.binding(connection) || payload.credentialRevision !== record.credentialRevision
|
||||
|| typeof payload.key !== 'string' || !payload.key || payload.key.length > 16000) throw new Error('Invalid decrypted binding');
|
||||
if (connection.id === 'legacy-default') { this.provider.setKey(payload.key); this.provider.legacyCredentialRevision = record.credentialRevision; }
|
||||
else this.provider.credentials.set(connection.id, { key: payload.key, revision: record.credentialRevision });
|
||||
} catch { this.issues.set(connection.id, 'decrypt_failed'); }
|
||||
finally { plain?.fill(0); }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { randomUUID, createHash } from 'node:crypto';
|
||||
import { setTimeout as delay } from 'node:timers/promises';
|
||||
import { ModelRequestError } from '../../server/diagnostics.mjs';
|
||||
import { CredentialVault } from './credential-vault.mjs';
|
||||
|
||||
const legacyId = 'legacy-default';
|
||||
const stamp = () => new Date().toISOString();
|
||||
@@ -25,6 +26,7 @@ export class ModelHub {
|
||||
for (const attempt of this.attempts) if (attempt.status === 'running') { attempt.status = 'unknown'; attempt.finishedAt = stamp(); attempt.reason = '宿主重启,请求结果与用量待核对。'; recovered = true; }
|
||||
if (recovered) this.saveAttempts();
|
||||
provider.credentials ??= new Map();
|
||||
if (store.storage.meta('modelCredentials', null)) this.vault().restore(this);
|
||||
}
|
||||
save(config = null) {
|
||||
this.state.revision++;
|
||||
@@ -46,6 +48,8 @@ export class ModelHub {
|
||||
editRegistry(action) {
|
||||
if (this.editingRegistry) return action();
|
||||
const before = structuredClone(this.state), credentials = new Map(this.provider.credentials);
|
||||
const originalKey = this.provider.apiKey, legacyRevision = this.provider.legacyCredentialRevision;
|
||||
const vaultIssues = this.credentialVault ? new Map(this.credentialVault.issues) : null;
|
||||
this.editingRegistry = true;
|
||||
try {
|
||||
return this.store.storage.transaction(() => {
|
||||
@@ -57,6 +61,9 @@ export class ModelHub {
|
||||
this.state = before;
|
||||
this.provider.credentials.clear();
|
||||
for (const [id, value] of credentials) this.provider.credentials.set(id, value);
|
||||
this.provider.apiKey = originalKey; this.provider.legacyCredentialRevision = legacyRevision;
|
||||
this.credentialVault?.reload();
|
||||
if (vaultIssues) this.credentialVault.issues = vaultIssues;
|
||||
throw cause;
|
||||
} finally { this.editingRegistry = false; }
|
||||
}
|
||||
@@ -66,21 +73,48 @@ export class ModelHub {
|
||||
model: this.store.config.model, enabled: true, requiresKey: false, revision: this.store.config.configRevision ?? 1,
|
||||
contextLimit: this.store.config.contextLimit, maxOutputTokens: this.store.config.maxOutputTokens, concurrency: 1, source: 'legacy' }, ...this.state.connections];
|
||||
}
|
||||
credential(connection) { return connection.id === legacyId ? { key: this.provider.apiKey, revision: 1 } : this.provider.credentials.get(connection.id); }
|
||||
credential(connection) { return connection.id === legacyId ? { key: this.provider.apiKey, revision: this.provider.legacyCredentialRevision ?? 1 } : this.provider.credentials.get(connection.id); }
|
||||
vault() { return this.credentialVault ??= new CredentialVault(this.store, this.provider); }
|
||||
manageCredential(input) {
|
||||
const connection = this.connection(input.id);
|
||||
if (input.revision !== connection.revision) throw error('模型连接已修改,请刷新凭据保存页面。', 409);
|
||||
return this.editRegistry(() => {
|
||||
const vault = this.vault(), previous = vault.state.entries[connection.id];
|
||||
if (input.action === 'save') {
|
||||
const revision = (this.credential(connection)?.revision ?? 0) + 1, record = vault.prepare(connection, input.apiKey, revision);
|
||||
if (connection.id === legacyId) { this.provider.setKey(input.apiKey); this.provider.legacyCredentialRevision = revision; }
|
||||
else this.provider.credentials.set(connection.id, { key: input.apiKey.trim(), revision });
|
||||
vault.stage(connection.id, record);
|
||||
} else if (input.action === 'delete' || input.action === 'forget') {
|
||||
vault.stage(connection.id, null);
|
||||
if (input.action === 'forget') {
|
||||
if (connection.id === legacyId) { this.provider.setKey(''); this.provider.legacyCredentialRevision = (this.provider.legacyCredentialRevision ?? 1) + 1; }
|
||||
else this.provider.credentials.set(connection.id, { key: '', revision: (this.credential(connection)?.revision ?? 0) + 1 });
|
||||
}
|
||||
} else if (input.action === 'disable' || input.action === 'enable') {
|
||||
if (!previous) throw error('该连接没有本机保存块。');
|
||||
vault.stage(connection.id, { ...previous, enabled: input.action === 'enable' });
|
||||
if (input.action === 'enable') vault.restore(this);
|
||||
} else throw error('凭据保存操作无效。');
|
||||
this.save(); return { credential: vault.status(connection), center: this.view(), config: { ...this.store.config, hasKey: this.provider.hasKey() } };
|
||||
});
|
||||
}
|
||||
identity(connection) { return connection.id + ':' + connection.revision + ':' + (this.credential(connection)?.revision ?? 0); }
|
||||
status(connection) {
|
||||
const credential = this.credential(connection), health = this.health.get(this.identity(connection));
|
||||
const ready = connection.enabled && (!connection.requiresKey || !!credential?.key);
|
||||
return { ...connection, hasKey: !!credential?.key, credentialRevision: credential?.revision ?? 0, credentialStorage: 'memory',
|
||||
...(this.credentialVault ? { savedCredential: this.credentialVault.status(connection) } : {}),
|
||||
status: !connection.enabled ? 'disabled' : !ready ? 'needs_key' : health?.blocked ? 'needs_attention' : health?.cooldownUntil > Date.now() ? 'cooling' : 'configured',
|
||||
activeRequests: this.leases.get(connection.id) ?? 0, health: health ?? { state: 'unverified' },
|
||||
capabilities: { tools: 'protocol_declared', vision: 'unknown', audio: 'unknown' } };
|
||||
}
|
||||
view() { return { revision: this.state.revision, selected: this.state.selected, connections: this.connections().map(value => this.status(value)), pools: this.state.pools,
|
||||
imports: Object.entries(this.state.imports).map(([id, value]) => ({ id, ...value })), attempts: this.attempts.slice(-100).reverse(), waiting: this.waiting,
|
||||
storage: { credentials: 'memory', restart: '临时凭据在宿主退出后需要重新填写。', attemptsRetained: 1000 } }; }
|
||||
storage: { credentials: this.credentialVault ? 'memory-or-windows-user-dpapi' : 'memory', restart: '临时凭据在宿主退出后需要重新填写;已明确本机加密保存的连接按用户与原配置加载。', attemptsRetained: 1000 } }; }
|
||||
connection(id) { const value = this.connections().find(item => item.id === id); if (!value) throw error('模型连接不存在。', 404); return value; }
|
||||
upsert(input) {
|
||||
if (!this.editingRegistry) return this.editRegistry(() => this.upsert(input));
|
||||
if (input.id === legacyId) throw error('原连接请通过模型连接设置修改。');
|
||||
const previous = input.id ? this.connection(input.id) : null;
|
||||
if (this.state.connections.length >= 100 && !previous) throw error('最多保存100个模型连接。');
|
||||
@@ -100,6 +134,10 @@ export class ModelHub {
|
||||
this.state.connections = [...this.state.connections.filter(item => item.id !== connection.id), connection];
|
||||
this.save();
|
||||
if (Object.hasOwn(input, 'apiKey')) this.provider.credentials.set(connection.id, { key: input.apiKey.trim(), revision: (this.provider.credentials.get(connection.id)?.revision ?? 0) + 1 });
|
||||
if (input.persistKey === true) {
|
||||
const vault = this.vault(), record = vault.prepare(connection, input.apiKey, this.credential(connection)?.revision ?? 1);
|
||||
vault.stage(connection.id, record);
|
||||
}
|
||||
return this.status(connection);
|
||||
}
|
||||
toggle(id, enabled) {
|
||||
|
||||
+3
-1
@@ -138,16 +138,18 @@ return async (request, response) => {
|
||||
const hub = provider.modelHub(store);
|
||||
const importer = () => hub.importer ??= new ConfigImporter(hub);
|
||||
if (method === 'GET' && route === '/api/model-center') return json(response, hub.view());
|
||||
if (method === 'GET' && route === '/api/model-center/credentials') return json(response, hub.vault().view(hub));
|
||||
if (method === 'GET' && route === '/api/model-center/imports') return json(response, importer().discover());
|
||||
if (method === 'POST') {
|
||||
const input = await body(request);
|
||||
if (route === '/api/model-center/toggle') return json(response, hub.toggle(input.id, input.enabled));
|
||||
if (runtime.hasActivity()) throw Object.assign(new Error('请先停止正在运行的任务,再修改或测试模型配置。'), { status: 409 });
|
||||
if (route === '/api/model-center/credentials') return json(response, hub.manageCredential(input));
|
||||
if (route === '/api/model-center/connections') return json(response, hub.upsert(input), 201);
|
||||
if (route === '/api/model-center/pools') return json(response, hub.pool(input), 201);
|
||||
if (route === '/api/model-center/select') return json(response, { center: hub.select(input), config: { ...store.config, hasKey: provider.hasKey() } });
|
||||
if (route === '/api/model-center/import-preview') return json(response, importer().preview(input.source, String(input.path ?? '')));
|
||||
if (route === '/api/model-center/import-apply') return json(response, importer().apply(input.previewId, input.autoSync));
|
||||
if (route === '/api/model-center/import-apply') return json(response, importer().apply(input.previewId, input.autoSync, input.persistCredentials));
|
||||
if (route === '/api/model-center/import-toggle') return json(response, importer().toggle(input.id, input.enabled));
|
||||
if (route === '/api/model-center/import-sync') return json(response, { results: importer().sync(), center: hub.view() });
|
||||
if (route === '/api/model-center/probe') {
|
||||
|
||||
@@ -9,6 +9,7 @@ import { ConfigImporter } from '../core/models/config-import.mjs';
|
||||
import { createRequestHandler, createSessionPublisher } from './app.mjs';
|
||||
import { APP_VERSION } from './diagnostics.mjs';
|
||||
import { hostAuthority } from '../core/desktop/host-authority.mjs';
|
||||
import { CredentialVault } from '../core/models/credential-vault.mjs';
|
||||
|
||||
// Keep the existing objects and their in-memory connection. No credential is
|
||||
// extracted, transferred, returned, or persisted by this operation.
|
||||
@@ -25,7 +26,8 @@ export function installUpgrade(context, { appDirectory, updateServiceInfo = true
|
||||
const oldAuthorityPrototype = oldAuthority ? Object.getPrototypeOf(oldAuthority) : null;
|
||||
const oldPrototypes = [Object.getPrototypeOf(store), Object.getPrototypeOf(provider), Object.getPrototypeOf(runtime)];
|
||||
const oldModelPrototypes = { hub: provider.hub ? Object.getPrototypeOf(provider.hub) : null,
|
||||
importer: provider.hub?.importer ? Object.getPrototypeOf(provider.hub.importer) : null };
|
||||
importer: provider.hub?.importer ? Object.getPrototypeOf(provider.hub.importer) : null,
|
||||
vault: provider.hub?.credentialVault ? Object.getPrototypeOf(provider.hub.credentialVault) : null };
|
||||
const oldStoreProperties = { ...store };
|
||||
const oldRuntimeProperties = { appDirectory: runtime.appDirectory, workers: runtime.workers, controlledEngines: runtime.controlledEngines, checks: runtime.checks, deliveries: runtime.deliveries, codeIndex: runtime.codeIndex, changeSets: runtime.changeSets, contextPlans: runtime.contextPlans, workspaces: runtime.workspaces, research: runtime.research, engines: runtime.engines, browser: runtime.browser, taskPlans: runtime.taskPlans, projectMemories: runtime.projectMemories, taskCheckpoints: runtime.taskCheckpoints, skills: runtime.skills, mcp: runtime.mcp };
|
||||
const oldUpdates = store.listeners('update');
|
||||
@@ -40,6 +42,7 @@ export function installUpgrade(context, { appDirectory, updateServiceInfo = true
|
||||
if (provider.hub) {
|
||||
Object.setPrototypeOf(provider.hub, ModelHub.prototype);
|
||||
if (provider.hub.importer) Object.setPrototypeOf(provider.hub.importer, ConfigImporter.prototype);
|
||||
if (provider.hub.credentialVault) Object.setPrototypeOf(provider.hub.credentialVault, CredentialVault.prototype);
|
||||
}
|
||||
runtime.appDirectory = root; runtime.workers = null; runtime.controlledEngines = null; runtime.checks = null; runtime.deliveries = null; runtime.codeIndex = null; runtime.changeSets = null; runtime.contextPlans = null; runtime.workspaces = null; runtime.research = null; runtime.engines = null; runtime.browser = null; runtime.taskPlans = null; runtime.projectMemories = null; runtime.taskCheckpoints = null; runtime.skills = null; runtime.mcp = null;
|
||||
store.ensureStorage();
|
||||
@@ -75,6 +78,7 @@ export function installUpgrade(context, { appDirectory, updateServiceInfo = true
|
||||
Object.setPrototypeOf(store, oldPrototypes[0]); Object.setPrototypeOf(provider, oldPrototypes[1]); Object.setPrototypeOf(runtime, oldPrototypes[2]);
|
||||
if (oldModelPrototypes.hub) Object.setPrototypeOf(provider.hub, oldModelPrototypes.hub);
|
||||
if (oldModelPrototypes.importer) Object.setPrototypeOf(provider.hub.importer, oldModelPrototypes.importer);
|
||||
if (oldModelPrototypes.vault) Object.setPrototypeOf(provider.hub.credentialVault, oldModelPrototypes.vault);
|
||||
store.removeAllListeners('update'); for (const observer of oldUpdates) store.on('update', observer);
|
||||
server.removeAllListeners('request'); for (const previous of oldHandlers) server.on('request', previous);
|
||||
throw error;
|
||||
|
||||
Reference in New Issue
Block a user