)
}
@@ -1005,7 +1027,7 @@ const ComposeBox = memo(function ComposeBox({
}),
],
editorProps: {
- attributes: { class: 'gmail-compose-content' },
+ attributes: { class: 'compose-content' },
},
content: initialContent,
})
@@ -1054,16 +1076,17 @@ const ComposeBox = memo(function ComposeBox({
}
// The signed-in account's display name, used to sign off AI-generated emails.
+ // Loaded in every mode (new, reply, forward) since the AI writer is available
+ // throughout and needs a name to sign off with.
const [selfName, setSelfName] = useState('')
const selfFirstName = useMemo(() => firstNameFromDisplayName(selfName), [selfName])
useEffect(() => {
- if (!isNew) return
let cancelled = false
window.ipc.invoke('gmail:getAccountName', {})
.then((res) => { if (!cancelled && res?.name) setSelfName(res.name) })
.catch(() => {})
return () => { cancelled = true }
- }, [isNew])
+ }, [])
const [aiPrompt, setAiPrompt] = useState('')
const [generating, setGenerating] = useState(false)
@@ -1101,6 +1124,18 @@ const ComposeBox = memo(function ComposeBox({
if (!instruction.trim()) { toast('Describe what to write.', 'error'); return }
system = AI_GENERATE_SYSTEM
const ctx: string[] = []
+ // When replying or forwarding, give the model the thread it's responding
+ // to (oldest first) so the draft is on-topic and references the right
+ // points. New emails have no thread and skip this.
+ if (thread) {
+ const threadText = thread.messages
+ .map((message, index) => {
+ const header = message.from ? `From: ${message.from}\n` : ''
+ return `--- Message ${index + 1} ---\n${header}${(message.body || '').trim()}`
+ })
+ .join('\n\n')
+ ctx.push(`This is a ${modeLabel.toLowerCase()} to the following email thread (oldest first):\n${threadText}`)
+ }
// Use the recipients' names (from the contacts picker) so the AI can
// address them naturally; fall back to the address when there's no name.
const recipientNames = toList
@@ -1111,7 +1146,7 @@ const ComposeBox = memo(function ComposeBox({
.filter(Boolean)
if (recipientNames.length) ctx.push(`Recipient(s): ${recipientNames.join(', ')}`)
if (selfFirstName) ctx.push(`Sender's first name (sign off as this): ${selfFirstName}`)
- if (subject.trim()) ctx.push(`Desired subject hint: ${subject.trim()}`)
+ if (isNew && subject.trim()) ctx.push(`Desired subject hint: ${subject.trim()}`)
if (current) ctx.push(`Existing draft (revise or build on it):\n${current}`)
prompt = `${ctx.length ? ctx.join('\n') + '\n\n' : ''}Instruction: ${instruction.trim()}`
} else {
@@ -1135,15 +1170,18 @@ const ComposeBox = memo(function ComposeBox({
// draft lands in the editor's undo history and the toolbar's Undo reverts it.
if (aiMode === 'generate') {
const { subject: generatedSubject, body } = parseGeneratedEmail(res.text)
- if (generatedSubject) setSubject(generatedSubject)
+ // Only new emails take the AI's subject; replies/forwards keep their
+ // derived "Re:"/"Fwd:" subject (and don't expose a subject field).
+ if (generatedSubject && isNew) setSubject(generatedSubject)
// Always sign off with the account first name, even if the model omitted it.
const signed = ensureSignature(body, selfFirstName)
editor.chain().focus().selectAll().insertContent(plainTextToHtml(signed)).run()
setHasGenerated(true)
} else {
- // Rewrites also regenerate the subject so it stays in sync with the body.
+ // Rewrites also regenerate the subject so it stays in sync with the body —
+ // but only for new emails, to preserve a reply/forward's threaded subject.
const { subject: rewrittenSubject, body } = parseGeneratedEmail(res.text)
- if (rewrittenSubject) setSubject(rewrittenSubject)
+ if (rewrittenSubject && isNew) setSubject(rewrittenSubject)
editor.chain().focus().selectAll().insertContent(plainTextToHtml(body)).run()
}
} catch (err) {
@@ -1301,84 +1339,100 @@ const ComposeBox = memo(function ComposeBox({
window.dispatchEvent(new Event('email-block:draft-with-assistant'))
}
- const card = (
-
- setAiPrompt(event.target.value)}
- placeholder={hasGenerated
- ? 'Edit the draft (e.g. add a line about…, remove the last paragraph)…'
- : 'Describe the email and let AI write it…'}
- disabled={generating}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault()
- void runAiBar()
- }
- }}
- />
-
-
-
-
- {TONE_PRESETS.map((preset) => (
-
- ))}
-
-
- )}
+
+ setAiPrompt(event.target.value)}
+ placeholder={hasGenerated
+ ? 'Edit the draft (e.g. add a line about…, remove the last paragraph)…'
+ : isNew
+ ? 'Describe the email and let AI write it…'
+ : 'Describe your reply and let AI write it…'}
+ disabled={generating}
+ onKeyDown={(event) => {
+ if (event.key === 'Enter') {
+ event.preventDefault()
+ void runAiBar()
+ }
+ }}
+ />
+
+