diff --git a/src/App.css b/src/App.css index 80aca7d..4bdd09d 100644 --- a/src/App.css +++ b/src/App.css @@ -1158,7 +1158,10 @@ a:hover { .book-travel-status-hud__collapse:focus-visible, .book-travel-status-hud__compact-button:focus-visible, .book-travel-hud-text-button:focus-visible, -.book-travel-hud-details > summary:focus-visible { +.book-travel-hud-details > summary:focus-visible, +.book-travel-panel-toggle:focus-visible, +.book-travel-style-preset-add:focus-visible, +.book-travel-style-preset-remove:focus-visible { outline: 2px solid #d97757; outline-offset: 2px; } @@ -1183,6 +1186,30 @@ a:hover { padding: 2px 18px 24px; } +.book-travel-session-controls .book-travel-hud-section:first-child { + padding-top: 8px; +} + +.book-travel-hud-checks { + display: flex; + flex-direction: column; + gap: 8px; + margin-top: 10px; +} + +.book-travel-hud-check { + display: flex; + align-items: flex-start; + gap: 8px; + color: #33312e; + font-size: 13px; + line-height: 1.4; +} + +.book-travel-hud-check input { + margin-top: 2px; +} + .book-travel-hud-section { padding: 17px 0; border-bottom: 1px solid #e8e2da; @@ -1200,6 +1227,75 @@ a:hover { letter-spacing: 0.03em; } +.book-travel-panel-toggle { + display: flex; + width: 100%; + align-items: center; + justify-content: space-between; + gap: 8px; + padding: 0; + border: 0; + background: transparent; + color: inherit; + cursor: pointer; + font: inherit; + letter-spacing: inherit; + text-align: left; +} + +.book-travel-panel-toggle:hover, +.book-travel-style-preset-add:hover, +.book-travel-style-preset-remove:hover { + color: #b85f43; +} + +.book-travel-style-preset-list { + display: flex; + flex-direction: column; + gap: 12px; +} + +.book-travel-style-preset-row { + display: flex; + align-items: center; + gap: 8px; +} + +.book-travel-style-preset-row > .ant-select { + flex: 1 1 auto; + min-width: 0; +} + +.book-travel-style-preset-add-row { + margin-top: 8px; +} + +.book-travel-style-preset-add, +.book-travel-style-preset-remove { + display: inline-flex; + align-items: center; + justify-content: center; + border: 1px solid #e3dcd4; + border-radius: 8px; + background: #fcfaf7; + color: #756e67; + cursor: pointer; + font: inherit; +} + +.book-travel-style-preset-remove { + width: 32px; + height: 32px; + flex: 0 0 32px; +} + +.book-travel-style-preset-add { + gap: 6px; + margin-top: 8px; + padding: 6px 10px; + font-size: 12px; +} + .book-travel-hud-section__body { display: flex; flex-direction: column; @@ -1625,6 +1721,18 @@ a:hover { overflow-y: auto; } +.book-travel-setup-picker h3 { + margin: 0 0 8px; + color: #33312e; + font-size: 14px; + font-weight: 600; +} + +.book-travel-setup-picker .book-travel-style-preset-add, +.book-travel-setup-picker .book-travel-style-preset-remove { + background: #ffffff; +} + .book-travel-setup-card, .adventure-setup-card { display: flex; diff --git a/src/__tests__/book-travel-materials-page.test.tsx b/src/__tests__/book-travel-materials-page.test.tsx index 914f2a7..1dc5670 100644 --- a/src/__tests__/book-travel-materials-page.test.tsx +++ b/src/__tests__/book-travel-materials-page.test.tsx @@ -166,4 +166,59 @@ describe('BookTravelMaterials page', () => { expect(useBookTravelStore.getState().assembledMaterials[0].title).toBe('新素材标题'); }); }); + + it('refreshes checked character cards into the assembled material', async () => { + usePartnerStore.setState({ + characterCards: [ + { + id: 'cc-new', + name: '沈霜', + type: 'character_card', + content: '旧正文', + fields: { skills: '新剑法', userRelationType: '好友' }, + worldBookId: 'wb-1', + }, + ], + }); + const materialId = useBookTravelStore.getState().saveAssembledMaterial({ + title: '旧素材标题', + materials: { + outline: { id: '/outline/旧.md', title: '旧.md', content: '旧大纲' }, + worldBook: { id: 'wb-1', title: '云州世界书', content: '世界书正文' }, + characterCards: [ + { id: 'cc-1', title: '沈霜', content: '旧设定' }, + { id: 'cc-2', title: '陆衡', content: '陆衡旧设定' }, + ], + }, + assembledWorldModel: { + originalTimeline: ['旧线'], + selectedCharacterProfiles: ['沈霜:旧摘要', '陆衡:不动'], + }, + stableMemory: null, + volatileMemory: null, + entryPoints: [], + recommendedUserCharacters: [], + }); + useBookTravelStore.getState().loadAssembledMaterial(materialId); + + render(); + + fireEvent.click(screen.getByLabelText('刷新人设 沈霜')); + fireEvent.click(screen.getByRole('button', { name: '刷新人设' })); + + await waitFor(() => { + const material = useBookTravelStore.getState().assembledMaterials[0]; + expect(material.materials.characterCards[0].id).toBe('cc-new'); + expect(material.materials.characterCards[0].content).toContain('新剑法'); + expect(material.materials.characterCards[0].content).not.toContain('好友'); + expect(material.materials.characterCards[1].content).toBe('陆衡旧设定'); + expect(material.materials.outline.content).toBe('旧大纲'); + expect(material.assembledWorldModel).toMatchObject({ + originalTimeline: ['旧线'], + selectedCharacterProfiles: ['沈霜:姓名:沈霜 新剑法', '陆衡:不动'], + }); + }); + expect(useBookTravelStore.getState().selectedCharacterCards[0].id).toBe('cc-new'); + expect(useBookTravelStore.getState().enabledCharacterCardIds).toEqual(['cc-new', 'cc-2']); + }); }); diff --git a/src/__tests__/book-travel-materials.test.ts b/src/__tests__/book-travel-materials.test.ts index 24a6dd3..475e0eb 100644 --- a/src/__tests__/book-travel-materials.test.ts +++ b/src/__tests__/book-travel-materials.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { resolveOutlineMaterial, resolvePartnerMaterials } from '../utils/bookTravelMaterials'; +import { refreshAssembledCharacterCards, resolveOutlineMaterial, resolvePartnerMaterials, filterBookTravelRequestContext } from '../utils/bookTravelMaterials'; import { usePartnerStore } from '../stores/usePartnerStore'; vi.mock('../utils/runtime', () => ({ @@ -94,4 +94,86 @@ describe('book-travel material resolution', () => { expect(ccContent).not.toContain('与用户关系底线'); expect(ccContent).not.toContain('关键事件'); }); + + it('refreshes a selected character by world book and name, including a regenerated card id', () => { + usePartnerStore.setState({ + worldBooks: [{ id: 'wb-1', name: '云州世界书', type: 'world_book', content: '世界书正文' }], + characterCards: [ + { + id: 'cc-new', + name: '沈霜', + type: 'character_card', + content: '旧正文', + fields: { skills: '新剑法', userRelationType: '好友' }, + worldBookId: 'wb-1', + }, + { + id: 'cc-other-book', + name: '沈霜', + type: 'character_card', + content: '其他世界书', + fields: { skills: '不该写入' }, + worldBookId: 'wb-2', + }, + ], + }); + + const refreshed = refreshAssembledCharacterCards( + [ + { id: 'cc-1', title: '沈霜', content: '旧设定' }, + { id: 'cc-2', title: '陆衡', content: '陆衡旧设定' }, + ], + 'wb-1', + ['cc-1', 'missing'], + { originalTimeline: ['旧线'], selectedCharacterProfiles: ['沈霜:旧摘要', '陆衡:不动'] }, + ); + + expect(refreshed.worldBookMissing).toBe(false); + expect(refreshed.characterCards[0]).toMatchObject({ id: 'cc-new', title: '沈霜' }); + expect(refreshed.characterCards[0].content).toContain('新剑法'); + expect(refreshed.characterCards[0].content).not.toContain('好友'); + expect(refreshed.characterCards[0].content).not.toContain('不该写入'); + expect(refreshed.characterCards[1].content).toBe('陆衡旧设定'); + expect(refreshed.missingIds).toEqual(['missing']); + expect(refreshed.assembledWorldModel).toMatchObject({ + originalTimeline: ['旧线'], + selectedCharacterProfiles: ['沈霜:姓名:沈霜 新剑法', '陆衡:不动'], + }); + }); + + it('does not refresh characters when the bound world book is gone', () => { + usePartnerStore.setState({ + worldBooks: [], + characterCards: [ + { id: 'cc-new', name: '沈霜', type: 'character_card', content: '新正文', worldBookId: 'wb-1' }, + ], + }); + + const refreshed = refreshAssembledCharacterCards( + [{ id: 'cc-1', title: '沈霜', content: '旧设定' }], + 'wb-1', + ['cc-1'], + { selectedCharacterProfiles: ['沈霜:旧摘要'] }, + ); + + expect(refreshed.worldBookMissing).toBe(true); + expect(refreshed.refreshedCards).toEqual([]); + expect(refreshed.characterCards[0].content).toBe('旧设定'); + }); + + it('drops unchecked character cards and their profile lines from the request context', () => { + const filtered = filterBookTravelRequestContext( + [ + { id: 'cc-1', title: '沈霜', content: '沈霜完整设定' }, + { id: 'cc-2', title: '陆衡', content: '陆衡完整设定' }, + ], + ['cc-1'], + { selectedCharacterProfiles: ['沈霜:冷', '陆衡:稳', '旁白:无人认领'] }, + ); + + expect(filtered.characterCards).toEqual([{ id: 'cc-1', title: '沈霜', content: '沈霜完整设定' }]); + expect(filtered.assembledWorldModel).toMatchObject({ + selectedCharacterProfiles: ['沈霜:冷'], + }); + }); }); diff --git a/src/__tests__/book-travel-store.test.ts b/src/__tests__/book-travel-store.test.ts index 0b0d5b1..94370b6 100644 --- a/src/__tests__/book-travel-store.test.ts +++ b/src/__tests__/book-travel-store.test.ts @@ -9,6 +9,8 @@ describe('useBookTravelStore', () => { selectedMaterialId: null, savedProgresses: [], activeSavedProgressId: null, + characterPanelOpen: true, + stylePresetPanelOpen: true, }); }); @@ -215,4 +217,31 @@ describe('useBookTravelStore', () => { useBookTravelStore.getState().resetSession(); expect(useBookTravelStore.getState().activeSavedProgressId).toBeNull(); }); + + it('keeps multiple style presets and panel visibility outside the saved progress', () => { + useBookTravelStore.setState({ + selectedMaterialId: 'material-1', + selectedEntryPointId: 'entry-1', + userCharacter: { name: '林晚', identity: '替嫁者', goal: '改写死局' }, + selectedStylePresetIds: ['preset-b', 'preset-a', 'preset-b'], + }); + useBookTravelStore.getState().setCharacterPanelOpen(false); + useBookTravelStore.getState().setStylePresetPanelOpen(false); + + const progressId = useBookTravelStore.getState().saveProgress({ mode: 'create', title: '多预设进度' }); + const snapshot = useBookTravelStore.getState().savedProgresses[0].snapshot; + expect(snapshot.selectedStylePresetIds).toEqual(['preset-b', 'preset-a']); + expect(snapshot).not.toHaveProperty('characterPanelOpen'); + expect(snapshot).not.toHaveProperty('stylePresetPanelOpen'); + + useBookTravelStore.getState().resetSession(); + expect(useBookTravelStore.getState().characterPanelOpen).toBe(false); + expect(useBookTravelStore.getState().stylePresetPanelOpen).toBe(false); + expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual([]); + + useBookTravelStore.getState().loadSavedProgress(progressId); + expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual(['preset-b', 'preset-a']); + expect(useBookTravelStore.getState().characterPanelOpen).toBe(false); + expect(useBookTravelStore.getState().stylePresetPanelOpen).toBe(false); + }); }); diff --git a/src/__tests__/story-book-travel-mode.test.tsx b/src/__tests__/story-book-travel-mode.test.tsx index fa21c15..448c3d2 100644 --- a/src/__tests__/story-book-travel-mode.test.tsx +++ b/src/__tests__/story-book-travel-mode.test.tsx @@ -195,6 +195,8 @@ function resetStoryBookTravelStores() { selectedMaterialId: null, savedProgresses: [], activeSavedProgressId: null, + characterPanelOpen: true, + stylePresetPanelOpen: true, }); invokeMock.mockClear(); invokeMock.mockImplementation(defaultInvoke); @@ -301,6 +303,8 @@ function getCurrentBookTravelSnapshot(overrides: Partial = { selectedStylePresetIds: state.selectedStylePresetIds, initialStylePresetIds: state.initialStylePresetIds, initialSystemPromptSnapshot: state.initialSystemPromptSnapshot, + enabledCharacterCardIds: state.enabledCharacterCardIds, + enabledStyleSegmentIds: state.enabledStyleSegmentIds, ...overrides, }; } @@ -441,6 +445,69 @@ describe('Story book-travel mode', () => { expect(startBtn).toBeEnabled(); }); + it('sends the characters and style segments chosen before the first book-travel turn', async () => { + useStylePresetStore.setState({ presets: [ + { id: 'book-1', name: '古典叙事', segments: [ + { id: 'narrative', title: '叙事', content: '穿书叙事片段', enabled: true }, + { id: 'battle', title: '战斗', content: '穿书战斗片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + ] }); + useBookTravelStore.getState().saveAssembledMaterial({ + title: '第一卷 · 云州入场', + materials: { + outline: { id: '/outline/第一卷.md', title: '第一卷.md', path: '/outline/第一卷.md', content: '大纲正文' }, + worldBook: { id: worldBook.id, title: worldBook.name, content: worldBook.content }, + characterCards: [ + { id: 'cc-test', title: '沈霜', content: '沈霜完整设定' }, + { id: 'cc-2', title: '陆衡', content: '陆衡完整设定' }, + ], + }, + assembledWorldModel: { selectedCharacterProfiles: ['沈霜:冷', '陆衡:稳'] }, + stableMemory: { worldRules: ['灵契不可违背'] }, + volatileMemory: { clues: [] }, + entryPoints: [ + { + id: 'entry-1', + title: '醒在婚宴', + summary: '红烛未灭,宾客已散', + timeAndLocation: '第一夜,沈府', + situation: '红烛未灭,宾客已散', + initialGoal: '查清替嫁真相', + risk: '被沈家识破', + }, + ], + recommendedUserCharacters: [ + { name: '林晚', identity: '替嫁者', background: '从现代穿入原书', personality: '清醒谨慎', goal: '改写死局' }, + ], + }); + + renderWithRouter(); + + fireEvent.mouseDown(screen.getAllByRole('combobox')[0]); + fireEvent.click(await screen.findByText('第一卷 · 云州入场')); + + expect(await screen.findByText('第一次对话发送的人物')).toBeInTheDocument(); + expect(screen.getByLabelText('第一次对话发送 沈霜')).toBeChecked(); + fireEvent.click(screen.getByLabelText('第一次对话发送 陆衡')); + + fireEvent.mouseDown(screen.getByLabelText('穿书文风预设')); + fireEvent.click(await screen.findByText('古典叙事')); + expect(screen.getByLabelText('本局提示词 叙事')).toBeChecked(); + fireEvent.click(screen.getByLabelText('本局提示词 战斗')); + fireEvent.click(screen.getByRole('button', { name: /开始穿书/ })); + + await waitFor(() => expect(invokeMock).toHaveBeenCalledWith('start_write_book_travel_change_scene_stream', expect.anything())); + const plannerCall = invokeMock.mock.calls.find(([command]) => command === 'start_plan_book_travel_scene_stream'); + const writerCall = invokeMock.mock.calls.find(([command]) => command === 'start_write_book_travel_change_scene_stream'); + expect(plannerCall?.[1].request.materials.characterCards.map((card: { title: string }) => card.title)).toEqual(['沈霜']); + expect(plannerCall?.[1].request.state.assembledWorldModel.selectedCharacterProfiles).toEqual(['沈霜:冷']); + expect(plannerCall?.[1].request.systemPrompt).not.toContain('穿书叙事片段'); + expect(writerCall?.[1].request.materials.characterCards.map((card: { title: string }) => card.title)).toEqual(['沈霜']); + expect(writerCall?.[1].request.state.assembledWorldModel.selectedCharacterProfiles).toEqual(['沈霜:冷']); + expect(writerCall?.[1].request.systemPrompt).toContain('穿书叙事片段'); + expect(writerCall?.[1].request.systemPrompt).not.toContain('穿书战斗片段'); + }); + it('switches to the conversation view and shows the planned scene while the first scene writer is running', async () => { invokeMock.mockImplementation((command: string, args?: any) => { if (command === 'start_plan_book_travel_scene_stream') { @@ -947,7 +1014,7 @@ describe('Story book-travel mode', () => { }); }); - it('restores only the final selected book-travel preset from legacy multi-select progress', () => { + it('restores every selected book-travel preset from saved progress', () => { setActiveBookTravelScene(); useBookTravelStore.setState({ selectedStylePresetIds: ['preset-b', 'preset-a'], @@ -957,7 +1024,7 @@ describe('Story book-travel mode', () => { const progressId = useBookTravelStore.getState().saveProgress({ mode: 'create', title: '预设进度' }); useBookTravelStore.setState({ selectedStylePresetIds: [] }); useBookTravelStore.getState().loadSavedProgress(progressId); - expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual(['preset-a']); + expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual(['preset-b', 'preset-a']); expect(useBookTravelStore.getState().initialStylePresetIds).toEqual(['preset-a']); expect(useBookTravelStore.getState().initialSystemPromptSnapshot).toBe('初始化穿书提示词'); }); @@ -1098,6 +1165,44 @@ describe('Story book-travel mode', () => { expect(classifyCall?.[1].request.systemPrompt).not.toContain('meta'); }); + it('sends only checked characters and style segments from the book-travel status panel', async () => { + useStylePresetStore.setState({ presets: [ + { id: 'book-1', name: '古典叙事', segments: [ + { id: 'narrative', title: '叙事', content: '穿书叙事片段', enabled: true }, + { id: 'battle', title: '战斗', content: '穿书战斗片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + ] }); + setActiveBookTravelScene(); + useBookTravelStore.setState({ + selectedStylePresetIds: ['book-1'], + selectedCharacterCards: [ + { id: 'cc-test', title: '沈霜', content: '沈霜完整设定' }, + { id: 'cc-2', title: '陆衡', content: '陆衡完整设定' }, + ], + assembledWorldModel: { selectedCharacterProfiles: ['沈霜:冷', '陆衡:稳'] }, + }); + + renderWithRouter(); + + expect(screen.queryByLabelText('穿书文风预设')).not.toBeInTheDocument(); + expect(screen.getByLabelText('穿书状态文风预设')).toBeInTheDocument(); + fireEvent.click(screen.getByLabelText('本轮发送 陆衡')); + fireEvent.click(screen.getByLabelText('本局提示词 战斗')); + fireEvent.change(screen.getByPlaceholderText(/说些什么/), { target: { value: '查看状态' } }); + fireEvent.click(document.querySelector('.de-ai-agent-run-button') as HTMLButtonElement); + + await waitFor(() => expect(invokeMock).toHaveBeenCalledWith('start_write_book_travel_insert_beat_stream', expect.anything())); + const writerCall = invokeMock.mock.calls.find(([command]) => command === 'start_write_book_travel_insert_beat_stream'); + const classifierCall = invokeMock.mock.calls.find(([command]) => command === 'classify_book_travel_input'); + expect(writerCall?.[1].request.materials.characterCards.map((card: { title: string }) => card.title)).toEqual(['沈霜']); + expect(writerCall?.[1].request.state.assembledWorldModel.selectedCharacterProfiles).toEqual(['沈霜:冷']); + expect(writerCall?.[1].request.systemPrompt).toContain('穿书叙事片段'); + expect(writerCall?.[1].request.systemPrompt).not.toContain('穿书战斗片段'); + expect(classifierCall?.[1].request.materials.characterCards.map((card: { title: string }) => card.title)).toEqual(['沈霜']); + expect(classifierCall?.[1].request.systemPrompt).not.toContain('穿书叙事片段'); + expect(classifierCall?.[1].request.systemPrompt).not.toContain('穿书战斗片段'); + }); + it('only prepends book-travel presets to scene-writer requests', async () => { useStylePresetStore.setState({ presets: [ { id: 'book-1', name: '古典叙事', segments: [{ id: 'book-segment-1', title: '叙事', content: '穿书预设正文', enabled: true }], createdAt: 1, updatedAt: 1 }, @@ -1116,6 +1221,107 @@ describe('Story book-travel mode', () => { expect(classifierCall?.[1].request.systemPrompt).not.toContain('穿书预设正文'); }); + it('adds a second book-travel style preset and sends the checked segments from both', async () => { + useStylePresetStore.setState({ presets: [ + { id: 'book-1', name: '古典叙事', segments: [ + { id: 'narrative', title: '叙事', content: '穿书叙事片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + { id: 'book-2', name: '战斗笔法', segments: [ + { id: 'battle', title: '战斗', content: '穿书战斗片段', enabled: true }, + { id: 'quiet', title: '静场', content: '穿书静场片段', enabled: false }, + ], createdAt: 1, updatedAt: 1 }, + ] }); + setActiveBookTravelScene(); + useBookTravelStore.setState({ selectedStylePresetIds: ['book-1'], enabledStyleSegmentIds: null }); + + renderWithRouter(); + + fireEvent.click(screen.getByRole('button', { name: '添加文风预设' })); + fireEvent.mouseDown(screen.getByLabelText('选择要添加的文风预设')); + const battleOption = await screen.findByText('战斗笔法'); + expect(screen.queryByRole('option', { name: '古典叙事' })).not.toBeInTheDocument(); + fireEvent.click(battleOption); + + expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual(['book-1', 'book-2']); + expect(screen.getByLabelText('本局提示词 战斗')).toBeChecked(); + expect(screen.getByLabelText('本局提示词 静场')).not.toBeChecked(); + fireEvent.click(screen.getByLabelText('本局提示词 静场')); + fireEvent.click(screen.getByLabelText('本局提示词 战斗')); + + fireEvent.change(screen.getByPlaceholderText(/说些什么/), { target: { value: '查看状态' } }); + fireEvent.click(document.querySelector('.de-ai-agent-run-button') as HTMLButtonElement); + + await waitFor(() => expect(invokeMock).toHaveBeenCalledWith('start_write_book_travel_insert_beat_stream', expect.anything())); + const writerCall = invokeMock.mock.calls.find(([command]) => command === 'start_write_book_travel_insert_beat_stream'); + expect(writerCall?.[1].request.systemPrompt).toMatch(/穿书叙事片段[\s\S]*穿书静场片段[\s\S]*穿书场景写手/); + expect(writerCall?.[1].request.systemPrompt).not.toContain('穿书战斗片段'); + }); + + it('removes one book-travel style preset without clearing the segments of the others', () => { + useStylePresetStore.setState({ presets: [ + { id: 'book-1', name: '古典叙事', segments: [ + { id: 'narrative', title: '叙事', content: '穿书叙事片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + { id: 'book-2', name: '战斗笔法', segments: [ + { id: 'battle', title: '战斗', content: '穿书战斗片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + ] }); + setActiveBookTravelScene(); + useBookTravelStore.setState({ + selectedStylePresetIds: ['book-1', 'book-2'], + enabledStyleSegmentIds: ['narrative', 'battle'], + }); + + renderWithRouter(); + + fireEvent.click(screen.getByRole('button', { name: '移除文风预设 古典叙事' })); + + expect(useBookTravelStore.getState().selectedStylePresetIds).toEqual(['book-2']); + expect(useBookTravelStore.getState().enabledStyleSegmentIds).toEqual(['battle']); + expect(screen.queryByLabelText('本局提示词 叙事')).not.toBeInTheDocument(); + expect(screen.getByLabelText('本局提示词 战斗')).toBeChecked(); + }); + + it('keeps character and style panels collapsed across visits without saving that in progress', () => { + useStylePresetStore.setState({ presets: [ + { id: 'book-1', name: '古典叙事', segments: [ + { id: 'narrative', title: '叙事', content: '穿书叙事片段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + ] }); + setActiveBookTravelScene(); + useBookTravelStore.setState({ selectedStylePresetIds: ['book-1'] }); + + const view = renderWithRouter(); + expect(screen.getByLabelText('本轮发送 沈霜')).toBeInTheDocument(); + expect(screen.getByLabelText('穿书状态文风预设')).toBeInTheDocument(); + + fireEvent.click(screen.getByRole('button', { name: '本轮发送的人物' })); + fireEvent.click(screen.getByRole('button', { name: '文风预设' })); + expect(screen.queryByLabelText('本轮发送 沈霜')).not.toBeInTheDocument(); + expect(screen.queryByLabelText('穿书状态文风预设')).not.toBeInTheDocument(); + expect(screen.getByRole('button', { name: '本轮发送的人物' })).toHaveAttribute('aria-expanded', 'false'); + expect(screen.getByRole('button', { name: '文风预设' })).toHaveAttribute('aria-expanded', 'false'); + + const progressId = useBookTravelStore.getState().saveProgress({ mode: 'create', title: '面板进度' }); + const snapshot = useBookTravelStore.getState().savedProgresses[0].snapshot; + expect(snapshot).not.toHaveProperty('characterPanelOpen'); + expect(snapshot).not.toHaveProperty('stylePresetPanelOpen'); + + view.unmount(); + useBookTravelStore.getState().resetSession(); + expect(useBookTravelStore.getState().characterPanelOpen).toBe(false); + expect(useBookTravelStore.getState().stylePresetPanelOpen).toBe(false); + useBookTravelStore.getState().loadSavedProgress(progressId); + + renderWithRouter(); + expect(screen.getByRole('button', { name: '本轮发送的人物' })).toHaveAttribute('aria-expanded', 'false'); + expect(screen.getByRole('button', { name: '文风预设' })).toHaveAttribute('aria-expanded', 'false'); + expect(screen.queryByLabelText('本轮发送 沈霜')).not.toBeInTheDocument(); + + fireEvent.click(screen.getByRole('button', { name: '本轮发送的人物' })); + expect(screen.getByLabelText('本轮发送 沈霜')).toBeInTheDocument(); + }); + it('passes the selected book-travel input mode prefix into the runtime calls and turn record', async () => { setActiveBookTravelScene(); diff --git a/src/__tests__/style-presets.test.ts b/src/__tests__/style-presets.test.ts index 981eab9..1178ef5 100644 --- a/src/__tests__/style-presets.test.ts +++ b/src/__tests__/style-presets.test.ts @@ -39,6 +39,20 @@ describe('文风预设', () => { expect(resolveStylePresets(presets, ['missing', 'a']).missingIds).toEqual(['missing']); }); + it('本局片段名单可以带上预设里关闭的片段,并排除未勾选片段', () => { + const presets = normalizeStylePresets([ + { id: 'a', name: '预设甲', segments: [ + { id: 'a1', title: '甲一', content: '第一段', enabled: false }, + { id: 'a2', title: '甲二', content: '第二段', enabled: true }, + ], createdAt: 1, updatedAt: 1 }, + ]); + + const result = prependStylePresets('基础提示词', presets, ['a'], ['a1']); + + expect(result).toContain('第一段'); + expect(result).not.toContain('第二段'); + }); + it('保留重复选择、对象引用、片段顺序和字符统计', () => { const presets = normalizeStylePresets([ { id: 'a', name: '预设甲', segments: [ diff --git a/src/components/BookTravelCharacterSendPicker.tsx b/src/components/BookTravelCharacterSendPicker.tsx new file mode 100644 index 0000000..d303dc9 --- /dev/null +++ b/src/components/BookTravelCharacterSendPicker.tsx @@ -0,0 +1,67 @@ +import type { BookTravelMaterial } from '../stores/useBookTravelStore'; +import { BookTravelCollapsibleSection } from './BookTravelCollapsibleSection'; + +interface BookTravelCharacterSendPickerProps { + characterCards: BookTravelMaterial[]; + enabledCharacterCardIds: string[] | null; + onEnabledCharacterCardIdsChange: (ids: string[]) => void; + open: boolean; + onOpenChange: (open: boolean) => void; + panelId: string; + title?: string; + className?: string; + labelForCard?: (card: BookTravelMaterial) => string; +} + +const checkedCharacterIds = (cards: BookTravelMaterial[], enabledIds: string[] | null) => ( + enabledIds ?? cards.map((card) => card.id) +); + +export function BookTravelCharacterSendPicker({ + characterCards, + enabledCharacterCardIds, + onEnabledCharacterCardIdsChange, + open, + onOpenChange, + panelId, + title = '本轮发送的人物', + className, + labelForCard = (card) => `本轮发送 ${card.title}`, +}: BookTravelCharacterSendPickerProps) { + const activeCharacterIds = checkedCharacterIds(characterCards, enabledCharacterCardIds); + + const toggleCharacter = (cardId: string, checked: boolean) => { + const next = new Set(activeCharacterIds); + if (checked) next.add(cardId); + else next.delete(cardId); + onEnabledCharacterCardIdsChange(characterCards.filter((card) => next.has(card.id)).map((card) => card.id)); + }; + + return ( + + {characterCards.length === 0 ? ( +
这份素材没有人物卡
+ ) : ( +
+ {characterCards.map((card) => ( + + ))} +
+ )} +
+ ); +} diff --git a/src/components/BookTravelCollapsibleSection.tsx b/src/components/BookTravelCollapsibleSection.tsx new file mode 100644 index 0000000..bbcb2f6 --- /dev/null +++ b/src/components/BookTravelCollapsibleSection.tsx @@ -0,0 +1,38 @@ +import type { ReactNode } from 'react'; +import { DownOutlined, UpOutlined } from '@ant-design/icons'; + +interface BookTravelCollapsibleSectionProps { + title: string; + className?: string; + open: boolean; + onOpenChange: (open: boolean) => void; + panelId: string; + children: ReactNode; +} + +export function BookTravelCollapsibleSection({ + title, + className, + open, + onOpenChange, + panelId, + children, +}: BookTravelCollapsibleSectionProps) { + return ( +
+

+ +

+ {open ?
{children}
: null} +
+ ); +} diff --git a/src/components/BookTravelSessionControls.tsx b/src/components/BookTravelSessionControls.tsx new file mode 100644 index 0000000..ecddeab --- /dev/null +++ b/src/components/BookTravelSessionControls.tsx @@ -0,0 +1,60 @@ +import type { BookTravelMaterial } from '../stores/useBookTravelStore'; +import type { StylePreset } from '../stores/useStylePresetStore'; +import { BookTravelCharacterSendPicker } from './BookTravelCharacterSendPicker'; +import { BookTravelStylePresetControl } from './BookTravelStylePresetControl'; + +interface BookTravelSessionControlsProps { + characterCards: BookTravelMaterial[]; + enabledCharacterCardIds: string[] | null; + onEnabledCharacterCardIdsChange: (ids: string[]) => void; + characterPanelOpen: boolean; + onCharacterPanelOpenChange: (open: boolean) => void; + presets: StylePreset[]; + selectedPresetIds: string[]; + enabledStyleSegmentIds: string[] | null; + onPresetsChange: (presetIds: string[], enabledStyleSegmentIds: string[] | null) => void; + onEnabledStyleSegmentIdsChange: (ids: string[]) => void; + stylePresetPanelOpen: boolean; + onStylePresetPanelOpenChange: (open: boolean) => void; +} + +export function BookTravelSessionControls({ + characterCards, + enabledCharacterCardIds, + onEnabledCharacterCardIdsChange, + characterPanelOpen, + onCharacterPanelOpenChange, + presets, + selectedPresetIds, + enabledStyleSegmentIds, + onPresetsChange, + onEnabledStyleSegmentIdsChange, + stylePresetPanelOpen, + onStylePresetPanelOpenChange, +}: BookTravelSessionControlsProps) { + return ( +
+ + +
+ ); +} diff --git a/src/components/BookTravelStatusHud.tsx b/src/components/BookTravelStatusHud.tsx index 4c923fc..005901c 100644 --- a/src/components/BookTravelStatusHud.tsx +++ b/src/components/BookTravelStatusHud.tsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo, useRef, useState } from 'react'; +import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'; import { LeftOutlined, RightOutlined } from '@ant-design/icons'; import type { BookTravelHudDynamicGroup, @@ -9,6 +9,7 @@ import type { interface BookTravelStatusHudProps { model: BookTravelHudModel; restorationKey?: string | null; + controls?: ReactNode; } const NARROW_LAYOUT_QUERY = '(max-width: 1100px)'; @@ -118,7 +119,7 @@ function DynamicGroup({ group, changedIds }: { group: BookTravelHudDynamicGroup; ); } -export function BookTravelStatusHud({ model, restorationKey = null }: BookTravelStatusHudProps) { +export function BookTravelStatusHud({ model, restorationKey = null, controls = null }: BookTravelStatusHudProps) { const [isNarrow, setIsNarrow] = useState(getInitialNarrowState); const [isOpen, setIsOpen] = useState(() => !getInitialNarrowState()); const [isSummaryExpanded, setIsSummaryExpanded] = useState(false); @@ -226,6 +227,7 @@ export function BookTravelStatusHud({ model, restorationKey = null }: BookTravel {model.isCompleted ?
旅程已结束
: null}
+ {controls} {model.dynamicGroups.map((group) => ( diff --git a/src/components/BookTravelStylePresetControl.tsx b/src/components/BookTravelStylePresetControl.tsx new file mode 100644 index 0000000..d83a1df --- /dev/null +++ b/src/components/BookTravelStylePresetControl.tsx @@ -0,0 +1,190 @@ +import { useState } from 'react'; +import { CloseOutlined, PlusOutlined } from '@ant-design/icons'; +import { Select } from 'antd'; +import type { StylePreset } from '../stores/useStylePresetStore'; +import { enabledStyleSegmentIdsForPreset } from '../utils/stylePresets'; +import { BookTravelCollapsibleSection } from './BookTravelCollapsibleSection'; + +interface BookTravelStylePresetControlProps { + presets: StylePreset[]; + selectedPresetIds: string[]; + enabledStyleSegmentIds: string[] | null; + onPresetsChange: (presetIds: string[], enabledStyleSegmentIds: string[] | null) => void; + onEnabledStyleSegmentIdsChange: (ids: string[]) => void; + open: boolean; + onOpenChange: (open: boolean) => void; + panelId: string; + title?: string; + className?: string; + selectAriaLabel?: string; +} + +const visibleSegments = (preset: StylePreset | undefined) => ( + (preset?.segments ?? []).filter((segment) => segment.content.trim()) +); + +export function BookTravelStylePresetControl({ + presets, + selectedPresetIds, + enabledStyleSegmentIds, + onPresetsChange, + onEnabledStyleSegmentIdsChange, + open, + onOpenChange, + panelId, + title = '文风预设', + className, + selectAriaLabel = '穿书文风预设', +}: BookTravelStylePresetControlProps) { + const [isAdding, setIsAdding] = useState(false); + const presetById = new Map(presets.map((preset) => [preset.id, preset])); + const selectedPresets = selectedPresetIds.flatMap((id) => { + const preset = presetById.get(id); + return preset ? [preset] : []; + }); + const unusedPresets = presets.filter((preset) => !selectedPresetIds.includes(preset.id)); + const rows = selectedPresetIds.length > 0 ? selectedPresetIds : [null]; + + const commitIds = (nextIds: string[]) => { + const seen = new Set(); + const unique = nextIds.filter((id) => { + if (!id || seen.has(id)) return false; + seen.add(id); + return true; + }); + if (enabledStyleSegmentIds == null) { + onPresetsChange(unique, null); + return; + } + const removed = new Set(selectedPresetIds.filter((id) => !unique.includes(id))); + const added = unique.filter((id) => !selectedPresetIds.includes(id)); + const removedSegmentIds = new Set( + presets.filter((preset) => removed.has(preset.id)).flatMap((preset) => preset.segments.map((segment) => segment.id)), + ); + const kept = enabledStyleSegmentIds.filter((id) => !removedSegmentIds.has(id)); + const extras = added.flatMap((id) => enabledStyleSegmentIdsForPreset(presetById.get(id))); + const nextEnabled = [...kept]; + extras.forEach((id) => { + if (!nextEnabled.includes(id)) nextEnabled.push(id); + }); + onPresetsChange(unique, nextEnabled); + }; + + const toggleSegment = (segmentId: string, checked: boolean) => { + const current = new Set( + enabledStyleSegmentIds ?? selectedPresets.flatMap((preset) => enabledStyleSegmentIdsForPreset(preset)), + ); + if (checked) current.add(segmentId); + else current.delete(segmentId); + const order = selectedPresets.flatMap((preset) => visibleSegments(preset).map((segment) => segment.id)); + onEnabledStyleSegmentIdsChange(order.filter((id) => current.has(id))); + }; + + return ( + + {presets.length === 0 ? ( +
暂无文风预设,请先在背景页创建
+ ) : ( + <> +
+ {rows.map((presetId, index) => { + const preset = presetId ? presetById.get(presetId) : undefined; + const options = presets.filter((item) => item.id === presetId || !selectedPresetIds.includes(item.id)); + const activeSegmentIds = enabledStyleSegmentIds == null + ? enabledStyleSegmentIdsForPreset(preset) + : visibleSegments(preset).filter((segment) => enabledStyleSegmentIds.includes(segment.id)).map((segment) => segment.id); + return ( +
+
+ toggleSegment(segment.id, event.target.checked)} + /> + {segment.title || '未命名提示词'} + + ))} +
+ ) : null} +
+ ); + })} +
+ {isAdding && unusedPresets.length > 0 ? ( +
+ setDetailTitle(event.target.value)} /> +
+
+
+
刷新人设
+
在素材绑定的世界书里按姓名写回当前人物卡,不重新装配大纲。
+
+ +
+ {selectedMaterial.materials.characterCards.length === 0 ? ( +
这份素材没有人物卡
+ ) : ( +
+ {selectedMaterial.materials.characterCards.map((card) => ( + + ))} +
+ )} +
+ { systemPrompt, }); + const readBookTravelRequestContext = () => { + const state = useBookTravelStore.getState(); + const filtered = filterBookTravelRequestContext( + state.selectedCharacterCards, + state.enabledCharacterCardIds, + state.assembledWorldModel, + ); + const requestMaterials = state.selectedOutline && state.selectedWorldBook ? { + outline: { id: state.selectedOutline.id, title: state.selectedOutline.title, content: state.selectedOutline.content }, + worldBook: { id: state.selectedWorldBook.id, title: state.selectedWorldBook.title, content: state.selectedWorldBook.content }, + characterCards: filtered.characterCards, + } : null; + return { state, requestMaterials, requestWorldModel: filtered.assembledWorldModel }; + }; const { userInfo: partnerChatUserInfo } = usePartnerChatStore(); const settings = useSettingsStore(); @@ -535,7 +552,12 @@ const useStoryView = () => { settings.bookTravelSceneWriterPrompt, stylePresets, bookTravelStore.selectedStylePresetIds, + bookTravelStore.enabledStyleSegmentIds, ); + const applyBookTravelStylePresets = (presetIds: string[], enabledSegmentIds: string[] | null) => { + bookTravelStore.setSelectedStylePresetIds(presetIds); + bookTravelStore.setEnabledStyleSegmentIds(enabledSegmentIds); + }; const chatHistoryRef = useRef(null); const currentThinkingIdRef = useRef(null); @@ -960,15 +982,12 @@ const useStoryView = () => { setWriterOutput(''); setStartProgressError(''); try { - const { selectedOutline, selectedWorldBook, selectedCharacterCards, stableMemory, volatileMemory, assembledWorldModel, scenes, turns } = useBookTravelStore.getState(); - if (!selectedOutline || !selectedWorldBook) throw new Error('素材缺失'); - const materials = { - outline: { id: selectedOutline.id, title: selectedOutline.title, content: selectedOutline.content }, - worldBook: { id: selectedWorldBook.id, title: selectedWorldBook.title, content: selectedWorldBook.content }, - characterCards: selectedCharacterCards.map((cc: any) => ({ id: cc.id, title: cc.title, content: cc.content })), - }; + const { state: travelState, requestMaterials, requestWorldModel } = readBookTravelRequestContext(); + if (!travelState.selectedOutline || !travelState.selectedWorldBook || !requestMaterials) throw new Error('素材缺失'); + const materials = requestMaterials; + const { stableMemory, volatileMemory, scenes, turns } = travelState; const writerConfig = settings.agentConfigs?.bookTravelSceneWriter || {}; - const writerState = { stableMemory, volatileMemory, assembledWorldModel, currentState: bookTravelStore.currentState, summaryMemory: bookTravelStore.summaryMemory || '', recentScenes: scenes.slice(-3), recentTurns: turns.slice(-5), writerInstructions: userInput }; + const writerState = { stableMemory, volatileMemory, assembledWorldModel: requestWorldModel, currentState: bookTravelStore.currentState, summaryMemory: bookTravelStore.summaryMemory || '', recentScenes: scenes.slice(-3), recentTurns: turns.slice(-5), writerInstructions: userInput }; const writerRequest = buildBookTravelRequest('scene-writer', effectiveBookTravelSceneWriterPrompt, writerConfig, materials, writerState); const currentScene = scenes.find((s) => s.id === bookTravelStore.currentSceneId); const allowedSpeakers = currentScene?.activeCharacters || []; @@ -1034,13 +1053,11 @@ const useStoryView = () => { let plannedScene: BookTravelScene | null = null; let newCurrentState: unknown = null; try { - const { selectedOutline, selectedWorldBook, selectedCharacterCards, stableMemory, volatileMemory, assembledWorldModel, scenes, turns, userCharacter } = useBookTravelStore.getState(); - if (!selectedOutline || !selectedWorldBook) throw new Error('素材缺失'); - const materials = { - outline: { id: selectedOutline.id, title: selectedOutline.title, content: selectedOutline.content }, - worldBook: { id: selectedWorldBook.id, title: selectedWorldBook.title, content: selectedWorldBook.content }, - characterCards: selectedCharacterCards.map((cc: any) => ({ id: cc.id, title: cc.title, content: cc.content })), - }; + const { state: travelState, requestMaterials, requestWorldModel } = readBookTravelRequestContext(); + if (!travelState.selectedOutline || !travelState.selectedWorldBook || !requestMaterials) throw new Error('素材缺失'); + const materials = requestMaterials; + const { stableMemory, volatileMemory, scenes, turns, userCharacter } = travelState; + const assembledWorldModel = requestWorldModel; const plannerConfig = settings.agentConfigs?.bookTravelScenePlanner || {}; const plannerState = { stableMemory, volatileMemory, assembledWorldModel, currentState: bookTravelStore.currentState, summaryMemory: bookTravelStore.summaryMemory || '', recentScenes: scenes.slice(-3), recentTurns: turns.slice(-5), userCharacter }; const plannerRequest = buildBookTravelRequest('scene-planner', settings.bookTravelPlotPlannerPrompt, plannerConfig, materials, plannerState); @@ -1154,16 +1171,14 @@ const useStoryView = () => { setStartProgressError(''); try { const store = useBookTravelStore.getState(); - const { selectedOutline, selectedWorldBook, selectedCharacterCards, stableMemory, volatileMemory, assembledWorldModel } = store; - if (!selectedOutline || !selectedWorldBook) throw new Error('素材缺失'); + const { requestMaterials, requestWorldModel } = readBookTravelRequestContext(); + if (!store.selectedOutline || !store.selectedWorldBook || !requestMaterials) throw new Error('素材缺失'); if (!turn.plannerOutput || !turn.createdSceneId) throw new Error('缺少可重试的场景规划'); const plannedScene = store.scenes.find((scene) => scene.id === turn.createdSceneId); if (!plannedScene) throw new Error('找不到规划出的场景'); - const materials = { - outline: { id: selectedOutline.id, title: selectedOutline.title, content: selectedOutline.content }, - worldBook: { id: selectedWorldBook.id, title: selectedWorldBook.title, content: selectedWorldBook.content }, - characterCards: selectedCharacterCards.map((cc: any) => ({ id: cc.id, title: cc.title, content: cc.content })), - }; + const materials = requestMaterials; + const { stableMemory, volatileMemory } = store; + const assembledWorldModel = requestWorldModel; await runChangeSceneWriterForPlan({ userInput: turn.userInput, plan: turn.plannerOutput, @@ -1206,7 +1221,7 @@ const useStoryView = () => { }; const startBookTravelAdventure = async () => { - const { selectedEntryPointId, userCharacter, assembledWorldModel, stableMemory, volatileMemory, selectedOutline, selectedWorldBook, selectedCharacterCards } = bookTravelStore; + const { selectedEntryPointId, userCharacter, stableMemory, volatileMemory, selectedOutline, selectedWorldBook } = bookTravelStore; if (!selectedEntryPointId) { message.warning('请选择一个入场点'); return; @@ -1236,11 +1251,10 @@ const useStoryView = () => { const entryPoint = bookTravelStore.entryPoints.find(ep => ep.id === selectedEntryPointId); if (!entryPoint) throw new Error('选中的入场点不存在'); - const materials = { - outline: { id: selectedOutline.id, title: selectedOutline.title, content: selectedOutline.content }, - worldBook: { id: selectedWorldBook.id, title: selectedWorldBook.title, content: selectedWorldBook.content }, - characterCards: selectedCharacterCards.map(cc => ({ id: cc.id, title: cc.title, content: cc.content })), - }; + const { requestMaterials, requestWorldModel } = readBookTravelRequestContext(); + if (!requestMaterials) throw new Error('素材缺失'); + const materials = requestMaterials; + const assembledWorldModel = requestWorldModel; const plannerConfig = settings.agentConfigs?.bookTravelScenePlanner || {}; const plannerState = { stableMemory, volatileMemory, assembledWorldModel, currentState: null, summaryMemory: '', recentScenes: [], recentTurns: [], userCharacter, selectedEntryPointId }; @@ -1349,8 +1363,8 @@ const useStoryView = () => { const pendingTurnId = `turn-${Date.now()}`; let pendingTurnCreated = false; try { - const { selectedOutline, selectedWorldBook, selectedCharacterCards } = useBookTravelStore.getState(); - if (!selectedOutline || !selectedWorldBook) { + const { state: travelState, requestMaterials, requestWorldModel } = readBookTravelRequestContext(); + if (!travelState.selectedOutline || !travelState.selectedWorldBook || !requestMaterials) { message.error('素材缺失,请重新装配素材'); return; } @@ -1364,17 +1378,13 @@ const useStoryView = () => { }); pendingTurnCreated = true; scrollToBottomOnce(); - const materials = { - outline: { id: selectedOutline.id, title: selectedOutline.title, content: selectedOutline.content }, - worldBook: { id: selectedWorldBook.id, title: selectedWorldBook.title, content: selectedWorldBook.content }, - characterCards: selectedCharacterCards.map((cc: any) => ({ id: cc.id, title: cc.title, content: cc.content })), - }; + const materials = requestMaterials; const classifierConfig = settings.agentConfigs?.bookTravelInputClassifier || {}; const latestBookTravelState = useBookTravelStore.getState(); const classifierState = { stableMemory: latestBookTravelState.stableMemory, volatileMemory: latestBookTravelState.volatileMemory, - assembledWorldModel: latestBookTravelState.assembledWorldModel, + assembledWorldModel: requestWorldModel, currentState: latestBookTravelState.currentState, summaryMemory: latestBookTravelState.summaryMemory || '', recentScenes: latestBookTravelState.scenes.slice(-3), @@ -2008,6 +2018,20 @@ const useStoryView = () => {
)} + {bookTravelStore.selectedMaterialId && ( + `第一次对话发送 ${card.title}`} + characterCards={bookTravelStore.selectedCharacterCards} + enabledCharacterCardIds={bookTravelStore.enabledCharacterCardIds} + onEnabledCharacterCardIdsChange={bookTravelStore.setEnabledCharacterCardIds} + open={bookTravelStore.characterPanelOpen} + onOpenChange={bookTravelStore.setCharacterPanelOpen} + /> + )} + {/* Select User Character */} {bookTravelStore.selectedEntryPointId && (
@@ -2058,11 +2082,16 @@ const useStoryView = () => {
)} - {/* Start Button */} - bookTravelStore.setSelectedStylePresetIds(id ? [id] : [])} + {/* Start Button */} @@ -2218,6 +2247,22 @@ const useStoryView = () => { + )} /> ) : null}
diff --git a/src/stores/useBookTravelStore.ts b/src/stores/useBookTravelStore.ts index af719c1..5bda24b 100644 --- a/src/stores/useBookTravelStore.ts +++ b/src/stores/useBookTravelStore.ts @@ -143,6 +143,8 @@ export interface BookTravelSnapshot { selectedStylePresetIds: string[]; initialStylePresetIds: string[]; initialSystemPromptSnapshot: string | null; + enabledCharacterCardIds: string[] | null; + enabledStyleSegmentIds: string[] | null; } interface BookTravelState extends BookTravelSnapshot { @@ -151,9 +153,15 @@ interface BookTravelState extends BookTravelSnapshot { selectedMaterialId: string | null; savedProgresses: BookTravelSavedProgress[]; activeSavedProgressId: string | null; + characterPanelOpen: boolean; + stylePresetPanelOpen: boolean; setInput: (input: string) => void; setInputMode: (mode: 'speech' | 'behavior' | 'plot') => void; setSelectedStylePresetIds: (ids: string[]) => void; + setCharacterPanelOpen: (characterPanelOpen: boolean) => void; + setStylePresetPanelOpen: (stylePresetPanelOpen: boolean) => void; + setEnabledCharacterCardIds: (enabledCharacterCardIds: string[]) => void; + setEnabledStyleSegmentIds: (enabledStyleSegmentIds: string[] | null) => void; setInitialStylePresetSnapshot: (ids: string[], prompt: string) => void; selectOutline: (outline: BookTravelMaterial | null) => void; selectWorldBook: (worldBook: BookTravelMaterial | null) => void; @@ -232,9 +240,23 @@ const initialState = { selectedStylePresetIds: [], initialStylePresetIds: [], initialSystemPromptSnapshot: null, + enabledCharacterCardIds: null as string[] | null, + enabledStyleSegmentIds: null as string[] | null, streamRuntime: initialStreamRuntime, }; +const uniqueStylePresetIds = (ids: unknown) => { + if (!Array.isArray(ids)) return []; + const seen = new Set(); + const result: string[] = []; + ids.forEach((id) => { + if (typeof id !== 'string' || !id || seen.has(id)) return; + seen.add(id); + result.push(id); + }); + return result; +}; + const materialId = () => `book-travel-material-${Date.now()}-${Math.random().toString(16).slice(2)}`; const savedProgressId = () => `book-travel-progress-${Date.now()}-${Math.random().toString(16).slice(2)}`; @@ -245,6 +267,8 @@ const loadMaterialIntoSession = (material: BookTravelAssembledMaterial): Partial selectedOutline: material.materials.outline, selectedWorldBook: material.materials.worldBook, selectedCharacterCards: material.materials.characterCards, + enabledCharacterCardIds: material.materials.characterCards.map((card) => card.id), + enabledStyleSegmentIds: null, assembledWorldModel: material.assembledWorldModel, stableMemory: material.stableMemory, volatileMemory: material.volatileMemory, @@ -262,10 +286,16 @@ export const useBookTravelStore = create()( selectedMaterialId: null, savedProgresses: [], activeSavedProgressId: null, + characterPanelOpen: true, + stylePresetPanelOpen: true, setInput: (input) => set({ input }), setInputMode: (inputMode) => set({ inputMode }), - setSelectedStylePresetIds: (selectedStylePresetIds) => set({ selectedStylePresetIds: selectedStylePresetIds.slice(-1) }), + setSelectedStylePresetIds: (selectedStylePresetIds) => set({ selectedStylePresetIds: uniqueStylePresetIds(selectedStylePresetIds) }), + setCharacterPanelOpen: (characterPanelOpen) => set({ characterPanelOpen }), + setStylePresetPanelOpen: (stylePresetPanelOpen) => set({ stylePresetPanelOpen }), + setEnabledCharacterCardIds: (enabledCharacterCardIds) => set({ enabledCharacterCardIds }), + setEnabledStyleSegmentIds: (enabledStyleSegmentIds) => set({ enabledStyleSegmentIds }), setInitialStylePresetSnapshot: (initialStylePresetIds, initialSystemPromptSnapshot) => set({ initialStylePresetIds, initialSystemPromptSnapshot }), selectOutline: (selectedOutline) => set({ selectedOutline }), selectWorldBook: (selectedWorldBook) => set({ selectedWorldBook }), @@ -413,7 +443,8 @@ export const useBookTravelStore = create()( set({ ...initialState, ...progress.snapshot, - selectedStylePresetIds: Array.isArray(progress.snapshot.selectedStylePresetIds) ? progress.snapshot.selectedStylePresetIds.slice(-1) : [], + ...normalizeBookTravelSelection(progress.snapshot), + selectedStylePresetIds: uniqueStylePresetIds(progress.snapshot.selectedStylePresetIds), selectedMaterialId: progress.materialId ?? null, activeSavedProgressId: id, streamRuntime: initialStreamRuntime, @@ -422,7 +453,8 @@ export const useBookTravelStore = create()( restoreSession: (snapshot) => set({ ...initialState, ...snapshot, - selectedStylePresetIds: Array.isArray(snapshot.selectedStylePresetIds) ? snapshot.selectedStylePresetIds.slice(-1) : [], + ...normalizeBookTravelSelection(snapshot), + selectedStylePresetIds: uniqueStylePresetIds(snapshot.selectedStylePresetIds), activeSavedProgressId: null, streamRuntime: initialStreamRuntime, }), @@ -471,6 +503,8 @@ export const useBookTravelStore = create()( partialize: (state) => ({ assembledMaterials: state.assembledMaterials, savedProgresses: state.savedProgresses, + characterPanelOpen: state.characterPanelOpen, + stylePresetPanelOpen: state.stylePresetPanelOpen, }), }, ), @@ -499,8 +533,22 @@ const getBookTravelSnapshot = (): BookTravelSnapshot => { ending: state.ending, input: state.input, inputMode: state.inputMode, - selectedStylePresetIds: state.selectedStylePresetIds, + selectedStylePresetIds: uniqueStylePresetIds(state.selectedStylePresetIds), initialStylePresetIds: state.initialStylePresetIds, initialSystemPromptSnapshot: state.initialSystemPromptSnapshot, + enabledCharacterCardIds: state.enabledCharacterCardIds, + enabledStyleSegmentIds: state.enabledStyleSegmentIds, + }; +}; + +const normalizeBookTravelSelection = (snapshot: Partial) => { + const cards = Array.isArray(snapshot.selectedCharacterCards) ? snapshot.selectedCharacterCards : []; + return { + enabledCharacterCardIds: Array.isArray(snapshot.enabledCharacterCardIds) + ? snapshot.enabledCharacterCardIds.filter((id): id is string => typeof id === 'string') + : cards.map((card) => card.id), + enabledStyleSegmentIds: Array.isArray(snapshot.enabledStyleSegmentIds) + ? snapshot.enabledStyleSegmentIds.filter((id): id is string => typeof id === 'string') + : null, }; }; diff --git a/src/utils/bookTravelMaterials.ts b/src/utils/bookTravelMaterials.ts index 2582027..ebc2ce5 100644 --- a/src/utils/bookTravelMaterials.ts +++ b/src/utils/bookTravelMaterials.ts @@ -2,6 +2,8 @@ import { appInvoke } from './runtime'; import { BookTravelMaterial } from '../stores/useBookTravelStore'; import { usePartnerStore, compileItemToMarkdown } from '../stores/usePartnerStore'; +const PROFILE_EXCERPT_LENGTH = 80; + const fileNameFromPath = (path: string) => { const normalized = path.replace(/\\/g, '/'); return normalized.split('/').filter(Boolean).pop() || path; @@ -48,3 +50,144 @@ export const resolvePartnerMaterials = (worldBookId: string, characterCardIds: s }), }; }; + +const isRecord = (value: unknown): value is Record => ( + typeof value === 'object' && value !== null && !Array.isArray(value) +); + +export const characterProfileMatches = (profile: string, name: string) => { + const text = profile.trim(); + const normalizedName = name.trim(); + if (!normalizedName) return false; + return text === normalizedName + || text.startsWith(`${normalizedName}:`) + || text.startsWith(`${normalizedName}:`); +}; + +export const characterProfileExcerpt = (content: string) => content + .replace(/^#+\s.*$/gm, '') + .replace(/[`*_>#-]/g, '') + .replace(/\s+/g, ' ') + .trim() + .slice(0, PROFILE_EXCERPT_LENGTH); + +export const characterProfileLine = (title: string, content: string) => { + const excerpt = characterProfileExcerpt(content); + return excerpt ? `${title}:${excerpt}` : title; +}; + +const readCharacterProfiles = (worldModel: unknown): string[] => { + if (!isRecord(worldModel) || !Array.isArray(worldModel.selectedCharacterProfiles)) return []; + return worldModel.selectedCharacterProfiles.filter((item): item is string => typeof item === 'string'); +}; + +export const replaceCharacterProfiles = ( + worldModel: unknown, + cards: Array>, +) => { + const base = isRecord(worldModel) ? { ...worldModel } : {}; + const profiles = [...readCharacterProfiles(base)]; + cards.forEach((card) => { + const nextLine = characterProfileLine(card.title, card.content ?? ''); + const index = profiles.findIndex((profile) => characterProfileMatches(profile, card.title)); + if (index >= 0) { + profiles[index] = nextLine; + return; + } + profiles.push(nextLine); + }); + return { + ...base, + selectedCharacterProfiles: profiles, + }; +}; + +export const filterSelectedCharacterProfiles = (worldModel: unknown, names: string[]) => { + if (!isRecord(worldModel) || !Array.isArray(worldModel.selectedCharacterProfiles)) return worldModel; + return { + ...worldModel, + selectedCharacterProfiles: worldModel.selectedCharacterProfiles.filter((profile) => ( + typeof profile === 'string' && names.some((name) => characterProfileMatches(profile, name)) + )), + }; +}; + +export const resolveEnabledCharacterCards = ( + cards: BookTravelMaterial[], + enabledCharacterCardIds: string[] | null | undefined, +) => { + if (!Array.isArray(enabledCharacterCardIds)) return cards; + const enabledIds = new Set(enabledCharacterCardIds); + return cards.filter((card) => enabledIds.has(card.id)); +}; + +export const filterBookTravelRequestContext = ( + cards: BookTravelMaterial[], + enabledCharacterCardIds: string[] | null | undefined, + assembledWorldModel: unknown, +) => { + const characterCards = resolveEnabledCharacterCards(cards, enabledCharacterCardIds); + return { + characterCards: characterCards.map((card) => ({ + id: card.id, + title: card.title, + content: card.content, + })), + assembledWorldModel: filterSelectedCharacterProfiles( + assembledWorldModel, + characterCards.map((card) => card.title), + ), + }; +}; + +export const refreshAssembledCharacterCards = ( + cards: BookTravelMaterial[], + worldBookId: string, + characterCardIds: string[], + worldModel: unknown, +) => { + const { worldBooks, characterCards: libraryCards } = usePartnerStore.getState(); + const worldBookExists = worldBooks.some((item) => item.id === worldBookId); + if (!worldBookExists) { + return { + characterCards: cards, + assembledWorldModel: worldModel, + missingIds: characterCardIds, + refreshedCards: [] as BookTravelMaterial[], + worldBookMissing: true, + }; + } + + const selectedIds = new Set(characterCardIds); + const libraryByName = new Map(); + libraryCards.forEach((card) => { + if (card.type !== 'character_card' || card.worldBookId !== worldBookId || libraryByName.has(card.name)) return; + libraryByName.set(card.name, card.id); + }); + + const missingIds: string[] = []; + const refreshedCards: BookTravelMaterial[] = []; + const characterCards = cards.map((card) => { + if (!selectedIds.has(card.id)) return card; + const libraryCardId = libraryByName.get(card.title); + const compiled = libraryCardId + ? resolvePartnerMaterials(worldBookId, [libraryCardId]).characterCards[0] + : undefined; + if (!compiled) { + missingIds.push(card.id); + return card; + } + refreshedCards.push(compiled); + return compiled; + }); + characterCardIds.forEach((id) => { + if (!cards.some((card) => card.id === id)) missingIds.push(id); + }); + return { + characterCards, + assembledWorldModel: replaceCharacterProfiles(worldModel, refreshedCards), + missingIds, + refreshedCards, + worldBookMissing: false, + }; +}; diff --git a/src/utils/stylePresets.ts b/src/utils/stylePresets.ts index 96e6bb6..f09217d 100644 --- a/src/utils/stylePresets.ts +++ b/src/utils/stylePresets.ts @@ -7,7 +7,17 @@ export interface ResolvedStylePresets { totalCharacters: number; } -export const resolveStylePresets = (presets: StylePreset[], selectedIds: string[]): ResolvedStylePresets => { +export const enabledStyleSegmentIdsForPreset = (preset: StylePreset | undefined): string[] => ( + (preset?.segments ?? []) + .filter((segment) => segment.enabled && segment.content.trim()) + .map((segment) => segment.id) +); + +export const resolveStylePresets = ( + presets: StylePreset[], + selectedIds: string[], + enabledSegmentIds?: string[] | null, +): ResolvedStylePresets => { const byId = new Map(presets.map((preset) => [preset.id, preset])); const missingIds: string[] = []; const resolved = selectedIds.flatMap((id) => { @@ -18,9 +28,14 @@ export const resolveStylePresets = (presets: StylePreset[], selectedIds: string[ } return [preset]; }); - const segments = resolved.flatMap((preset) => preset.segments.flatMap((segment) => ( - segment.enabled && segment.content.trim() ? [{ preset, segment }] : [] - ))); + const allowedSegmentIds = enabledSegmentIds == null ? null : new Set(enabledSegmentIds); + const segments = resolved.flatMap((preset) => preset.segments.flatMap((segment) => { + if (!segment.content.trim()) return []; + const included = allowedSegmentIds + ? allowedSegmentIds.has(segment.id) + : segment.enabled; + return included ? [{ preset, segment }] : []; + })); return { presets: resolved, segments, @@ -29,8 +44,13 @@ export const resolveStylePresets = (presets: StylePreset[], selectedIds: string[ }; }; -export const prependStylePresets = (baseSystemPrompt: string, presets: StylePreset[], selectedIds: string[]) => { - const resolved = resolveStylePresets(presets, selectedIds).segments; +export const prependStylePresets = ( + baseSystemPrompt: string, + presets: StylePreset[], + selectedIds: string[], + enabledSegmentIds?: string[] | null, +) => { + const resolved = resolveStylePresets(presets, selectedIds, enabledSegmentIds).segments; if (resolved.length === 0) return baseSystemPrompt; const presetBlock = resolved .map(({ segment }) => segment.content.trim())