feat(desktop): built-in Han/Eng layout auto-switching, terminal/Vim support, and Unicode input
This commit is contained in:
parent
1da04b9e46
commit
a3ac44da2b
109 changed files with 8234 additions and 242 deletions
|
|
@ -0,0 +1,183 @@
|
|||
// 내 기록(개인 n-gram) 후보를 모델보다 먼저 1번으로 띄우고 모델 후보는 뒤에 붙인다 — 대신하지 않고 더한다.
|
||||
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
const config = vi.hoisted(() => ({
|
||||
suggestionEnabled: true as boolean,
|
||||
suggestionModelId: 'gemma4:e4b' as string | null,
|
||||
llmModelId: 'gemma4:e4b' as string | null,
|
||||
inputExcludedApps: [] as string[],
|
||||
suggestionTriggerDelayMs: 600,
|
||||
suggestionMinPrefixChars: 4,
|
||||
suggestionMaxRequestsPerMinute: 20,
|
||||
suggestionDailyBudget: 500,
|
||||
suggestionRequestTimeoutMs: 8000,
|
||||
inputLearnTypedText: false,
|
||||
inputTelemetryEnabled: false,
|
||||
suggestionOverlayInteractive: true,
|
||||
insertMethod: 'clipboard'
|
||||
}))
|
||||
const ngram = vi.hoisted(() => ({ model: null as import('@d3ro/core/personal-ngram').PersonalNgramModel | null }))
|
||||
const harness = vi.hoisted(() => ({
|
||||
streamGenerate: vi.fn(),
|
||||
insertText: vi.fn(async (text: string) => ({ success: true, method: 'clipboard', textLength: text.length })),
|
||||
replaceBeforeCaret: vi.fn(async (_count: number, text: string) => ({
|
||||
success: true,
|
||||
method: 'clipboard',
|
||||
textLength: text.length
|
||||
}))
|
||||
}))
|
||||
|
||||
vi.mock('../../../src/main/services/ConfigService', () => ({
|
||||
configGet: vi.fn((key: keyof typeof config) => config[key]),
|
||||
configSet: vi.fn()
|
||||
}))
|
||||
vi.mock('../../../src/main/services/LoggerService', () => ({
|
||||
getLogger: () => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() })
|
||||
}))
|
||||
vi.mock('../../../src/main/services/LocalLLMService', () => ({
|
||||
getLocalLLMService: () => ({ isAvailable: () => true, streamGenerate: harness.streamGenerate })
|
||||
}))
|
||||
vi.mock('../../../src/main/services/InputTelemetryService', () => ({
|
||||
getInputTelemetryService: () => ({ listPhrases: () => [], listRecentWrites: () => [] })
|
||||
}))
|
||||
vi.mock('../../../src/main/services/PersonalGraphService', () => ({
|
||||
getPersonalGraphService: () => ({ retrieveContext: () => ({ continuations: [], related: [] }) })
|
||||
}))
|
||||
vi.mock('../../../src/main/services/TextInsertService', () => ({
|
||||
getTextInsertService: () => ({ insertText: harness.insertText, replaceBeforeCaret: harness.replaceBeforeCaret })
|
||||
}))
|
||||
vi.mock('../../../src/main/services/modifier-state', () => ({ prepareModifiersForPaste: async () => 'released' }))
|
||||
vi.mock('../../../src/main/utils/win32-foreground', () => ({ getForegroundWindowInfo: () => null }))
|
||||
vi.mock('../../../src/main/db', () => ({ getDatabase: vi.fn() }))
|
||||
vi.mock('../../../src/main/services/suggestion/PersonalNgramIndex', () => ({
|
||||
getPersonalNgramIndex: () => ({ model: () => ngram.model })
|
||||
}))
|
||||
vi.mock('../../../src/main/db/schema', () => ({ suggestions: {} }))
|
||||
|
||||
import {
|
||||
SuggestionService,
|
||||
type SuggestionServiceDeps
|
||||
} from '../../../src/main/services/SuggestionService'
|
||||
import { SuggestionBudget } from '../../../src/main/services/suggestion/SuggestionBudget'
|
||||
import { ModelWarmTracker } from '../../../src/main/services/suggestion/ModelWarmTracker'
|
||||
import type { TypingContext } from '../../../src/main/services/InputTelemetryService'
|
||||
|
||||
const PREFIX = '지금 테스트 해보는데 잠시 쉬면'
|
||||
|
||||
function typingContext(overrides: Partial<TypingContext> = {}): TypingContext {
|
||||
const prefix = overrides.prefix ?? PREFIX
|
||||
return {
|
||||
prefix,
|
||||
fullText: prefix,
|
||||
caretOffset: prefix.length,
|
||||
documentBefore: prefix,
|
||||
anchor: { x: 10, y: 10, width: 2, height: 16 },
|
||||
anchorKind: 'caret',
|
||||
isPassword: false,
|
||||
isEditable: true,
|
||||
isComposing: false,
|
||||
hasSelection: false,
|
||||
available: true,
|
||||
appName: 'notepad.exe',
|
||||
windowTitle: 'notes',
|
||||
windowHandle: null,
|
||||
idleMs: 2000,
|
||||
capturedAt: Date.now(),
|
||||
editedSinceFocus: true,
|
||||
typedRecently: true,
|
||||
...overrides
|
||||
}
|
||||
}
|
||||
|
||||
function deps(): SuggestionServiceDeps {
|
||||
const warmth = new ModelWarmTracker()
|
||||
warmth.noteWarm('gemma4:e4b', Date.now() + 600_000)
|
||||
return {
|
||||
repository: { record: vi.fn(), markAccepted: vi.fn(), list: vi.fn(() => []) },
|
||||
budget: new SuggestionBudget(),
|
||||
warmth,
|
||||
foreground: { currentWindowHandle: () => null },
|
||||
learning: { expectProgrammaticInsert: vi.fn(() => vi.fn()), recordAccepted: vi.fn() }
|
||||
}
|
||||
}
|
||||
|
||||
interface Internal {
|
||||
_generate(prefix: string, context: TypingContext, maxCandidates: number, maxChars: number): Promise<void>
|
||||
_lastContext: TypingContext | null
|
||||
_lastRequestAt: number
|
||||
}
|
||||
|
||||
let services: SuggestionService[] = []
|
||||
function create(): SuggestionService {
|
||||
const service = new SuggestionService(deps())
|
||||
services.push(service)
|
||||
return service
|
||||
}
|
||||
|
||||
import { PersonalNgramModel } from '@d3ro/core/personal-ngram'
|
||||
|
||||
beforeEach(() => {
|
||||
harness.streamGenerate.mockReset()
|
||||
const model = new PersonalNgramModel()
|
||||
for (const text of ['링크에서 확인할 수 있어요', '앱에서 확인할 수 있어요', '여기서 확인할 수 있어요']) model.addText(text)
|
||||
ngram.model = model
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
for (const service of services) service.dispose()
|
||||
services = []
|
||||
})
|
||||
|
||||
const PREFIX_N = '설정에서 확인할 '
|
||||
|
||||
async function run(prefix: string, until: (service: SuggestionService) => boolean): Promise<{ service: SuggestionService; seen: string[][] }> {
|
||||
const service = create()
|
||||
const seen: string[][] = []
|
||||
service.on('updated', (state) => seen.push(state.candidates.map((candidate) => candidate.text)))
|
||||
const context = typingContext({ prefix, documentBefore: prefix, fullText: prefix, caretOffset: prefix.length })
|
||||
;(service as unknown as Internal)._lastContext = context
|
||||
await (service as unknown as Internal)._generate(prefix, context, 3, 160)
|
||||
await vi.waitFor(() => expect(until(service)).toBe(true))
|
||||
return { service, seen }
|
||||
}
|
||||
|
||||
describe('내 기록 후보를 먼저 하나 더 (2026-10-25)', () => {
|
||||
it('모델을 기다리지 않고 1번으로 뜨고, 모델 후보는 뒤에 붙는다', async () => {
|
||||
harness.streamGenerate.mockImplementation(async function* () {
|
||||
yield ' 수 있는지 한번 볼게요.'
|
||||
})
|
||||
const { service, seen } = await run(PREFIX_N, (s) => s.getState().candidates.length >= 2)
|
||||
expect(seen[0]).toEqual(['수 있어요'])
|
||||
expect(service.getState().candidates.slice(0, 2).map((candidate) => candidate.text)).toEqual([
|
||||
'수 있어요',
|
||||
'수 있는지 한번 볼게요.'
|
||||
])
|
||||
})
|
||||
|
||||
it('모델 후보가 같은 글이면 하나만 남긴다', async () => {
|
||||
harness.streamGenerate.mockImplementation(async function* () {
|
||||
yield ' 수 있어요.'
|
||||
})
|
||||
const { service } = await run(PREFIX_N, (s) => s.getState().candidates.length >= 1 && !s.getState().candidates[0].source)
|
||||
expect(service.getState().candidates[0].text).toBe('수 있어요.')
|
||||
})
|
||||
|
||||
it('모델이 빈 결과로 끝나도 내 기록 후보는 남고 "제안 사항 없음" 은 뜨지 않는다', async () => {
|
||||
harness.streamGenerate.mockImplementation(async function* () {
|
||||
yield ''
|
||||
})
|
||||
const { service } = await run(PREFIX_N, (s) => !s.getState().generating)
|
||||
expect(service.getState()).toMatchObject({ notice: null })
|
||||
expect(service.getState().candidates.map((candidate) => candidate.text)).toEqual(['수 있어요'])
|
||||
})
|
||||
|
||||
it('내 기록이 모르면 예전처럼 모델 후보만 나온다', async () => {
|
||||
harness.streamGenerate.mockImplementation(async function* () {
|
||||
yield ' 김치찌개 먹자.'
|
||||
})
|
||||
const { service, seen } = await run('오늘 저녁은 뭐 먹을까 ', (s) => s.getState().candidates.length >= 1)
|
||||
expect(seen[0]).toEqual([])
|
||||
expect(service.getState().candidates[0].text).toBe('김치찌개 먹자.')
|
||||
})
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue