mirror of
https://github.com/EKKOLearnAI/hermes-web-ui.git
synced 2026-05-25 21:40:13 +00:00
610f3eb9d0
* feat(copilot): integrate GitHub Copilot provider with dynamic model list 集成 GitHub Copilot provider 与动态模型列表 EN: - New copilot-models service: fetch live model list from GitHub /models API - Filter noise IDs (accounts/, text-embedding, rerank prefixes) - Pass through preview/disabled metadata to frontend - Cache isolated per OAuth token (FNV-1a hash key) to prevent cross-account leak - Multi-source token resolution: env > apps.json > gh CLI - ModelSelector renders PREVIEW (orange) and UNAVAILABLE (gray, non-selectable) badges with tooltips - ProviderFormModal exposes Copilot OAuth login entry - New CopilotLoginModal component: guides gh auth login device flow - ProviderCard hides delete button for OAuth-only builtin providers (copilot/codex/nous) since their credentials live outside auth.json ZH: - 新增 copilot-models 服务:从 GitHub /models live API 拉取模型列表 - 噪音 ID 过滤(accounts/、text-embedding、rerank 前缀) - preview/disabled 元数据透传至前端 - 缓存按 OAuth token 隔离(FNV-1a hash key),避免切换 profile 串账号 - 多源 token 解析优先级:env > apps.json > gh CLI - ModelSelector 渲染 PREVIEW(橙色)/ UNAVAILABLE(灰色、不可选)badge,附 tooltip - ProviderFormModal 提供 Copilot OAuth 登录入口 - 新增 CopilotLoginModal 组件:引导 gh auth login 设备流程 - ProviderCard 对 OAuth-only builtin(copilot/codex/nous)隐藏删除按钮 其凭证不在 auth.json,删除按钮原本无效 Tests / 测试: new copilot-models suite (cache isolation, noise filter, preview/disabled passthrough) + copilot-login-modal — 24/24 passed. Pre-existing sessions-db-lineage failure on upstream/main is unrelated. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor(copilot): switch to explicit opt-in per maintainer feedback 回应 PR #239 review:上一版会自动把系统级 GitHub OAuth 凭证(VS Code Copilot 插件、gh CLI 登录态)当作 hermes provider 拉到列表里,对未在 hermes 中注册过 Copilot 的用户造成困扰。本次改为显式 opt-in:用户必须通过 Add Provider 主动添加, 删除时按 token 来源决定是否清 ~/.hermes/.env,并避免误清理 VS Code / gh CLI 用户的 全局凭证。 Address PR #239 review feedback. Previously Copilot would silently appear in the provider list whenever the host had any GitHub OAuth token (VS Code plugin, gh CLI login). This caused confusion for users who never explicitly registered Copilot in hermes. Now Copilot requires explicit opt-in via Add Provider; on delete we only clear ~/.hermes/.env when the token actually originated there, leaving VS Code / gh CLI credentials untouched. What changed - 新增 ~/.hermes-web-ui/config.json 的 copilotEnabled flag 控制可见性 - 即便能解析到 token,未启用时也不在列表中显示 - resolveCopilotOAuthTokenWithSource 区分 token 来源(env / gh-cli / apps-json) - ProviderFormModal 增加 GitHub Copilot 入口;无 token 时进 device flow modal - CopilotLoginModal 重写为 in-app device flow 状态机(不再要求用户在终端跑 gh) - 删除 Copilot 时仅 source='env' 才清 ~/.hermes/.env,并自动 fallback 默认模型 - 老用户升级兼容:若 default 仍指向已禁用的 copilot,后端清空 default 让前端兜底 API - POST /api/hermes/copilot-auth/check-token - POST /api/hermes/copilot-auth/enable - POST /api/hermes/copilot-auth/disable - POST /api/hermes/copilot-auth/start (device flow) - POST /api/hermes/copilot-auth/poll (device flow) Tests - tests/server/copilot-auth-controller.test.ts (11 cases) - tests/server/copilot-device-flow.test.ts (12 cases) - tests/client/copilot-login-modal.test.ts 重写覆盖状态机 Follow-ups (留作后续 PR) - device flow session 未绑定 profile,登录中切 profile 会写到错的 .env - copilot device-code 接口的 expires_in 字段未使用,硬编码 15 分钟超时 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
173 lines
7.1 KiB
TypeScript
173 lines
7.1 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
vi.mock('os', async () => {
|
|
const actual = await vi.importActual<typeof import('os')>('os')
|
|
return { ...actual, homedir: () => '/fake/home' }
|
|
})
|
|
|
|
const { mockReadFile, mockWriteFile, mockMkdir, mockSaveEnvValue, mockReadConfigYaml, mockWriteConfigYaml, mockResolveWithSource, mockInvalidate, mockReadAppConfig, mockWriteAppConfig } = vi.hoisted(() => ({
|
|
mockReadFile: vi.fn(),
|
|
mockWriteFile: vi.fn().mockResolvedValue(undefined),
|
|
mockMkdir: vi.fn().mockResolvedValue(undefined),
|
|
mockSaveEnvValue: vi.fn().mockResolvedValue(undefined),
|
|
mockReadConfigYaml: vi.fn(),
|
|
mockWriteConfigYaml: vi.fn().mockResolvedValue(undefined),
|
|
mockResolveWithSource: vi.fn(),
|
|
mockInvalidate: vi.fn(),
|
|
mockReadAppConfig: vi.fn(),
|
|
mockWriteAppConfig: vi.fn().mockResolvedValue({ copilotEnabled: true }),
|
|
}))
|
|
|
|
vi.mock('fs/promises', () => ({
|
|
readFile: mockReadFile,
|
|
writeFile: mockWriteFile,
|
|
mkdir: mockMkdir,
|
|
}))
|
|
|
|
vi.mock('../../packages/server/src/services/config-helpers', () => ({
|
|
saveEnvValue: mockSaveEnvValue,
|
|
readConfigYaml: mockReadConfigYaml,
|
|
writeConfigYaml: mockWriteConfigYaml,
|
|
}))
|
|
|
|
vi.mock('../../packages/server/src/services/hermes/copilot-models', () => ({
|
|
resolveCopilotOAuthTokenWithSource: mockResolveWithSource,
|
|
invalidateAllCaches: mockInvalidate,
|
|
}))
|
|
|
|
vi.mock('../../packages/server/src/services/hermes/hermes-profile', () => ({
|
|
getActiveEnvPath: () => '/fake/home/.hermes/.env',
|
|
}))
|
|
|
|
vi.mock('../../packages/server/src/services/app-config', () => ({
|
|
readAppConfig: mockReadAppConfig,
|
|
writeAppConfig: mockWriteAppConfig,
|
|
}))
|
|
|
|
vi.mock('../../packages/server/src/services/logger', () => ({
|
|
logger: { info: vi.fn(), error: vi.fn(), warn: vi.fn() },
|
|
}))
|
|
|
|
import * as ctrl from '../../packages/server/src/controllers/hermes/copilot-auth'
|
|
|
|
function makeCtx(): any {
|
|
return { params: {}, request: { body: {} }, body: undefined, status: 200 }
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockReadFile.mockResolvedValue('')
|
|
mockReadConfigYaml.mockResolvedValue({})
|
|
})
|
|
|
|
afterEach(() => {
|
|
delete process.env.COPILOT_GITHUB_TOKEN
|
|
})
|
|
|
|
describe('copilot-auth controller — checkToken', () => {
|
|
it('reports has_token=false / source=null / enabled=false when nothing resolves', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: '', source: null })
|
|
mockReadAppConfig.mockResolvedValue({})
|
|
const ctx = makeCtx()
|
|
await ctrl.checkToken(ctx)
|
|
expect(ctx.body).toEqual({ has_token: false, source: null, enabled: false })
|
|
expect(mockInvalidate).toHaveBeenCalled()
|
|
})
|
|
|
|
it('reports source and enabled flag', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: 'gho_xxx', source: 'env' })
|
|
mockReadAppConfig.mockResolvedValue({ copilotEnabled: true })
|
|
const ctx = makeCtx()
|
|
await ctrl.checkToken(ctx)
|
|
expect(ctx.body).toEqual({ has_token: true, source: 'env', enabled: true })
|
|
})
|
|
})
|
|
|
|
describe('copilot-auth controller — enable', () => {
|
|
it('persists copilotEnabled=true and invalidates cache', async () => {
|
|
const ctx = makeCtx()
|
|
await ctrl.enable(ctx)
|
|
expect(mockWriteAppConfig).toHaveBeenCalledWith({ copilotEnabled: true })
|
|
expect(mockInvalidate).toHaveBeenCalled()
|
|
expect(ctx.body).toEqual({ ok: true })
|
|
})
|
|
})
|
|
|
|
describe('copilot-auth controller — disable', () => {
|
|
it('clears ~/.hermes/.env when token source is env', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: 'gho_xxx', source: 'env' })
|
|
process.env.COPILOT_GITHUB_TOKEN = 'gho_xxx'
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockSaveEnvValue).toHaveBeenCalledWith('COPILOT_GITHUB_TOKEN', '')
|
|
expect(process.env.COPILOT_GITHUB_TOKEN).toBeUndefined()
|
|
expect(mockWriteAppConfig).toHaveBeenCalledWith({ copilotEnabled: false })
|
|
expect(ctx.body).toEqual({ ok: true, cleared_env: true, cleared_default: false })
|
|
})
|
|
|
|
it('does NOT touch .env when token source is gh-cli (preserves gh CLI session)', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: 'gho_xxx', source: 'gh-cli' })
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockSaveEnvValue).not.toHaveBeenCalled()
|
|
expect(mockWriteAppConfig).toHaveBeenCalledWith({ copilotEnabled: false })
|
|
expect(ctx.body).toEqual({ ok: true, cleared_env: false, cleared_default: false })
|
|
})
|
|
|
|
it('does NOT touch .env when token source is apps-json (preserves VS Code Copilot)', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: 'gho_xxx', source: 'apps-json' })
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockSaveEnvValue).not.toHaveBeenCalled()
|
|
expect(mockWriteAppConfig).toHaveBeenCalledWith({ copilotEnabled: false })
|
|
expect(ctx.body).toEqual({ ok: true, cleared_env: false, cleared_default: false })
|
|
})
|
|
|
|
it('still flips enabled=false even when no token is resolvable', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: '', source: null })
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockSaveEnvValue).not.toHaveBeenCalled()
|
|
expect(mockWriteAppConfig).toHaveBeenCalledWith({ copilotEnabled: false })
|
|
})
|
|
|
|
it('clears default model when it belongs to copilot', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: '', source: null })
|
|
mockReadConfigYaml.mockResolvedValue({ model: { default: 'gpt-4o', provider: 'copilot' } })
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockWriteConfigYaml).toHaveBeenCalledWith(expect.objectContaining({ model: {} }))
|
|
expect(ctx.body).toEqual(expect.objectContaining({ cleared_default: true }))
|
|
})
|
|
|
|
it('does NOT touch default model when it belongs to a different provider', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: '', source: null })
|
|
mockReadConfigYaml.mockResolvedValue({ model: { default: 'glm-4', provider: 'zhipu' } })
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(mockWriteConfigYaml).not.toHaveBeenCalled()
|
|
expect(ctx.body).toEqual(expect.objectContaining({ cleared_default: false }))
|
|
})
|
|
|
|
it('returns 500 and does NOT flip enabled flag when writeConfigYaml fails', async () => {
|
|
mockResolveWithSource.mockResolvedValue({ token: 'gho_xxx', source: 'env' })
|
|
mockReadConfigYaml.mockResolvedValue({ model: { default: 'gpt-4o', provider: 'copilot' } })
|
|
mockWriteConfigYaml.mockRejectedValueOnce(new Error('disk full'))
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
expect(ctx.status).toBe(500)
|
|
expect(mockSaveEnvValue).not.toHaveBeenCalled()
|
|
expect(mockWriteAppConfig).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('does not write process.env on persistToken / disable cleanup is defensive only', async () => {
|
|
// disable 不依赖 process.env 被写入;只清理之前可能由外部 export 的覆盖。
|
|
mockResolveWithSource.mockResolvedValue({ token: '', source: null })
|
|
process.env.COPILOT_GITHUB_TOKEN = 'leftover-from-shell'
|
|
const ctx = makeCtx()
|
|
await ctrl.disable(ctx)
|
|
// source=null → 不动 .env,也不清 process.env(因为不是 web-ui 自己的状态)
|
|
expect(process.env.COPILOT_GITHUB_TOKEN).toBe('leftover-from-shell')
|
|
})
|
|
})
|