1
0
Fork 0

Compare commits

..

No commits in common. "c36e5654ed20c43764a25340de1e727028d7068f" and "0595c98991efe328bc967d1cead376e22dda0154" have entirely different histories.

6 changed files with 13 additions and 80 deletions

View File

@ -67,16 +67,6 @@
padding-left: 1.5em;
}
.blockquote {
display: block;
opacity: .5;
white-space: pre-wrap;
word-wrap: break-word;
border-left: 2px solid currentColor;
margin-bottom: .5em;
padding-left: .5em;
}
.hr {
border: none;
border-top: 1px solid var(--hrColor, #555);

View File

@ -41,14 +41,12 @@ export const parseTable = (table: string): string => {
export const highlight = (message: string, keepMarkup = true): string => {
let resultHTML = '';
const tokenRegex = /(\*\*?|"|```|`|(?:^|\n)#{1,3} |(?:^|\n)> |\n)/g;
const tokenRegex = /(\*\*?|"|```|`|(?:^|\n)#{1,3} |\n)/g;
const headerRegex = /#{1,3} $/;
const blockquoteRegex = /> $/;
const stack: string[] = [];
let inCodeBlock = false;
let inMonospaced = false;
let inHeader = false;
let inBlockquote = false;
let lastIndex = 0;
let match: RegExpExecArray | null;
@ -85,7 +83,6 @@ export const highlight = (message: string, keepMarkup = true): string => {
const headerMatch = token.match(headerRegex);
if (headerMatch) {
if (inHeader) resultHTML += '</span>';
if (inBlockquote) { resultHTML += '</span>'; inBlockquote = false; }
const markup = keepMarkup ? headerMatch[0] : '';
const len = headerMatch[0].length;
inHeader = true;
@ -93,23 +90,10 @@ export const highlight = (message: string, keepMarkup = true): string => {
continue;
}
const blockquoteMatch = token.match(blockquoteRegex);
if (blockquoteMatch) {
if (inHeader) { resultHTML += '</span>'; inHeader = false; }
if (inBlockquote) resultHTML += '</span>';
const markup = keepMarkup ? '> ' : '';
inBlockquote = true;
resultHTML += `${token.slice(0, -2)}<span class="${styles.blockquote}">${markup}`;
continue;
}
if (token === '\n') {
if (inHeader) {
resultHTML += `${keepMarkup ? '\n' : ''}</span>`;
inHeader = false;
} else if (inBlockquote) {
resultHTML += `${keepMarkup ? '\n' : ''}</span>`;
inBlockquote = false;
} else {
resultHTML += '\n';
}
@ -142,7 +126,6 @@ export const highlight = (message: string, keepMarkup = true): string => {
resultHTML += message.slice(lastIndex);
if (inHeader) resultHTML += '</span>';
if (inBlockquote) resultHTML += '</span>';
resultHTML += '</span>'.repeat(stack.length);
if (!keepMarkup) {

View File

@ -10,7 +10,6 @@ import Prompt from "../utils/prompt";
import { Tools } from "../utils/tools";
import { Sparkles } from "lucide-preact";
import clsx from "clsx";
import { ContentEditable } from "@common/components/ContentEditable";
// ─── Role Header ──────────────────────────────────────────────────────────────
@ -351,18 +350,13 @@ export const ChatSidebar = () => {
</button>
</div>
</div>
<ContentEditable
autoLines
<textarea
class={styles.input}
value={input}
onInput={setInput}
onKeyDown={handleKeyDown}
placeholder={
isLoading
? 'Generating...'
: isDisabled
? 'Connect to an LLM server to chat'
: 'Type a message...'}
placeholder={isDisabled ? 'Connect to an LLM server to chat' : 'Type a message...'}
rows={3}
disabled={isDisabled}
/>
{isLoading ? (

View File

@ -2,7 +2,7 @@ import { ContentEditable } from "@common/components/ContentEditable";
import { highlight } from "@common/highlight";
import { useAppState, type Tab } from "../contexts/state";
import styles from '../assets/editor.module.css';
import { useMemo, useRef, useEffect } from "preact/hooks";
import { useMemo } from "preact/hooks";
import clsx from "clsx";
import { CharacterEditor } from "./character-editor";
import { LocationEditor } from "./location-editor";
@ -17,8 +17,7 @@ const TABS: { id: Tab; label: string; right?: boolean }[] = [
{ id: "lore", label: "Lore" },
{ id: "characters", label: "Characters" },
{ id: "locations", label: "Locations" },
{ id: "scratchpad", label: "Scratchpad", right: true },
{ id: "prompt", label: "Prompt" },
{ id: "prompt", label: "Prompt", right: true },
];
export const Editor = () => {
@ -27,12 +26,11 @@ export const Editor = () => {
const handleInput = useInputCallback((text: string) => {
if (!currentStory) return;
dispatch({ type: 'EDIT_STORY', id: currentStory.id, text });
}, [currentStory?.id]);
const handleScratchpadInput = useInputCallback((text: string) => {
if (!currentStory) return;
dispatch({ type: 'EDIT_STORY', id: currentStory.id, text });
dispatch({
type: 'EDIT_STORY',
id: currentStory.id,
text,
});
}, [currentStory?.id]);
const handleTabChange = (tab: Tab) => {
@ -44,14 +42,6 @@ export const Editor = () => {
});
};
const contentRef = useRef<HTMLDivElement>(null);
useEffect(() => {
if (contentRef.current) {
contentRef.current.scrollTop = contentRef.current.scrollHeight;
}
}, [currentStory?.currentTab]);
const storyValue = useMemo(() => currentStory ? highlight(currentStory.text) : '', [currentStory?.text]);
const promptPreview = useMemo(() => {
if (currentStory?.currentTab !== 'prompt') return '';
@ -68,7 +58,7 @@ export const Editor = () => {
<div class={styles.title}>
{currentStory.title}
</div>
<div class={styles.content} ref={contentRef}>
<div class={styles.content}>
{currentStory.currentTab === "story" && (
<ContentEditable
class={styles.editable}
@ -89,14 +79,6 @@ export const Editor = () => {
{currentStory.currentTab === "chapters" && (
<ChaptersEditor />
)}
{currentStory.currentTab === "scratchpad" && (
<ContentEditable
class={styles.editable}
value={currentStory.scratchpad ?? ''}
onInput={handleScratchpadInput}
placeholder="Notes, ideas, outlines — anything you don't want in the story..."
/>
)}
{currentStory.currentTab === "prompt" && (
<div class={styles.promptPreview} dangerouslySetInnerHTML={{ __html: promptPreview }} />
)}

View File

@ -11,7 +11,7 @@ export type ChatMessage = LLM.ChatMessage & {
id: string;
}
export type Tab = "story" | "lore" | "characters" | "locations" | "chapters" | "scratchpad" | "prompt";
export type Tab = "story" | "lore" | "characters" | "locations" | "chapters" | "prompt";
export enum CharacterRole {
Protagonist = 'protagonist',
@ -67,7 +67,6 @@ export interface Story {
id: string;
title: string;
text: string;
scratchpad: string;
lore: LoreEntry[];
characters: Character[];
locations: Location[];
@ -94,7 +93,6 @@ type Action =
| { type: 'CREATE_STORY'; title: string }
| { type: 'RENAME_STORY'; id: string; title: string }
| { type: 'EDIT_STORY'; id: string; text: string }
| { type: 'EDIT_SCRATCHPAD'; id: string; text: string }
| { type: 'ADD_LORE_ENTRY'; storyId: string; entry: LoreEntry }
| { type: 'EDIT_LORE_ENTRY'; storyId: string; entryId: string; updates: Partial<LoreEntry> }
| { type: 'DELETE_LORE_ENTRY'; storyId: string; entryId: string }
@ -143,7 +141,6 @@ function reducer(state: IState, action: Action): IState {
id: crypto.randomUUID(),
title: action.title,
text: '',
scratchpad: '',
lore: [],
characters: [],
locations: [],
@ -259,7 +256,6 @@ function reducer(state: IState, action: Action): IState {
id: crypto.randomUUID(),
title: `${original.title} (Copy)`,
text: '',
scratchpad: '',
lore: [...original.lore],
characters: original.characters,
locations: original.locations,
@ -487,14 +483,6 @@ function reducer(state: IState, action: Action): IState {
}),
};
}
case 'EDIT_SCRATCHPAD': {
return {
...state,
stories: state.stories.map(s =>
s.id === action.id ? { ...s, scratchpad: action.text } : s
),
};
}
case 'STORE_CHAPTER_SUMMARY': {
return {
...state,

View File

@ -299,10 +299,6 @@ namespace Prompt {
parts.push(locationsSection);
}
if (currentStory.scratchpad) {
parts.push(`## Scratchpad`, currentStory.scratchpad);
}
if (currentStory.text && storyTokenBudget > 0) {
const storyText = formatStoryChunks(currentStory.text, currentStory.chapters ?? [], storyTokenBudget);
if (storyText) {