make sampling work

Author: kentcdodds

src/db/index.ts

@@ -447,7 +447,7 @@ export class DB {
 		`)
 
 		const insertResult = await ps
-			.bind(validatedTag.name, validatedTag.description, userId)
+			.bind(validatedTag.name, validatedTag.description ?? null, userId)
 			.run()
 
 		if (!insertResult.success || !insertResult.meta.last_row_id) {

src/db/schema.ts

@@ -71,7 +71,7 @@ export const tagSchema = z.object({
 
 export const newTagSchema = z.object({
 	name: z.string(),
-	description: z.string().nullable().optional(),
+	description: z.string().optional(),
 })
 
 export const entryTagSchema = z.object({

src/tools.ts

@@ -170,6 +170,11 @@ Please ask them explicitely for their email address and don't just guess.
 
 					const existingTags = await agent.db.getTags(user.id)
 					const existingTagNames = existingTags.map((t) => t.name)
+					const currentTags = await agent.db.getEntryTags(
+						user.id,
+						createdEntry.id,
+					)
+					const currentTagNames = currentTags.map((t) => t.name)
 
 					const result = await agent.server.server.createMessage({
 						messages: [
@@ -179,16 +184,24 @@ Please ask them explicitely for their email address and don't just guess.
 									type: 'text',
 									mimeType: 'text/plain',
 									text: `
-Based on this journal entry, suggest relevant tags. Consider the title, content, mood, location, and weather. Only suggest tags that don't already exist. Here's the entry:
-Title: ${createdEntry.title}
-Content: ${createdEntry.content}
-Mood: ${createdEntry.mood || 'not specified'}
-Location: ${createdEntry.location || 'not specified'}
-Weather: ${createdEntry.weather || 'not specified'}
-
-Existing tags: ${existingTagNames.join(', ')}
-
-Respond with a JSON array of tag names only.
+Based on this journal entry, suggest relevant tags. Consider the title, content, mood, location, and weather. Only suggest tags that are not already applied to this entry. Feel free to suggest new tags that are not currently in the database and they will be created.
+
+<entry
+	id="${createdEntry.id}"
+	title="${createdEntry.title}"
+	mood="${createdEntry.mood || 'not specified'}"
+	location="${createdEntry.location || 'not specified'}"
+	weather="${createdEntry.weather || 'not specified'}"
+	is-private="${createdEntry.isPrivate ? 'true' : 'false'}"
+	is-favorite="${createdEntry.isFavorite ? 'true' : 'false'}"
+	tags="${currentTagNames.join(', ')}"
+>
+	${createdEntry.content}
+</entry>
+
+Existing tags already in the database: ${existingTagNames.join(', ')}
+
+Respond with a JSON array of tag names only. If you don't suggest any tags, respond with an empty array.
 									`.trim(),
 								},
 							},
@@ -219,15 +232,17 @@ Respond with a JSON array of tag names only.
 						for (const tagName of newTags) {
 							await agent.db.createTag(user.id, { name: tagName })
 						}
+					}
 
-						const createdTags = await agent.db.getTags(user.id)
+					const userTags = await agent.db.getTags(user.id)
 
-						for (const tag of createdTags) {
-							await agent.db.addTagToEntry(user.id, {
-								entryId: createdEntry.id,
-								tagId: tag.id,
-							})
-						}
+					for (const tag of userTags.filter((t) =>
+						suggestedTags.includes(t.name),
+					)) {
+						await agent.db.addTagToEntry(user.id, {
+							entryId: createdEntry.id,
+							tagId: tag.id,
+						})
 					}
 
 					return createReply({