Change score system to 0-5 scale and remove isGeneric field

- Update classification prompt to request 0-5 scores for fun/interesting
- Add calculateCombinedScore() utility to avoid formula duplication
- Round scores to 1 decimal place at parse time (conf to 2 decimals)
- Remove isGeneric field entirely - derive geocodability from location fields
- Update prompt to not default to home country for generic activities
- Update all tests and fixtures for new score scale

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: ndbroadbent

src/classifier/index.ts

@@ -7,12 +7,13 @@
 
 import { generateClassifierCacheKey } from '../cache/key'
 import type { ResponseCache } from '../cache/types'
-import type {
-  ActivityCategory,
-  CandidateMessage,
-  ClassifiedActivity,
-  ClassifierConfig,
-  Result
+import {
+  type ActivityCategory,
+  type CandidateMessage,
+  type ClassifiedActivity,
+  type ClassifierConfig,
+  calculateCombinedScore,
+  type Result
 } from '../types'
 import { DEFAULT_MODELS } from './models'
 import {
@@ -75,9 +76,10 @@ function toClassifiedActivity(
   const capitalizedTitle = title.charAt(0).toUpperCase() + title.slice(1)
 
   // Build activity without ID first
+  // Scores are 0-5 scale from the AI
   const funScore = response.fun
   const interestingScore = response.int
-  const score = interestingScore * 2 + funScore
+  const score = calculateCombinedScore(funScore, interestingScore)
 
   const activity = {
     activity: capitalizedTitle,
@@ -94,7 +96,6 @@ function toClassifiedActivity(
         message: resolvedMessage.content
       }
     ],
-    isGeneric: response.gen,
     isCompound: response.com,
     action: response.act,
     actionOriginal: response.act_orig,

src/classifier/prompt.test.ts

@@ -106,7 +106,6 @@ describe('Classifier Prompt', () => {
       expect(prompt).toContain('"venue"')
       expect(prompt).toContain('"city"')
       expect(prompt).toContain('"country"')
-      expect(prompt).toContain('"gen"')
       expect(prompt).toContain('"com"')
     })
 
@@ -261,7 +260,6 @@ describe('Classifier Prompt', () => {
       expect(parsed[0]?.fun).toBe(0.9)
       expect(parsed[0]?.cat).toBe('restaurant')
       expect(parsed[0]?.conf).toBe(0.95)
-      expect(parsed[0]?.gen).toBe(false)
       expect(parsed[0]?.com).toBe(true)
       expect(parsed[0]?.act).toBe('eat')
       expect(parsed[0]?.venue).toBe('Italian place')
@@ -271,8 +269,8 @@ describe('Classifier Prompt', () => {
 
     it('parses multiple items', () => {
       const response = `[
-        {"msg": 1, "title": "Hiking", "fun": 0.8, "int": 0.6, "cat": "hike", "conf": 0.9, "gen": true, "com": true, "act": "hike", "act_orig": "hiking", "obj": null, "obj_orig": null, "venue": null, "city": "Mountains", "region": null, "country": null},
-        {"msg": 2, "title": "Vet visit", "fun": 0.1, "int": 0.2, "cat": "other", "conf": 0.85, "gen": false, "com": true, "act": "visit", "act_orig": "visit", "obj": "vet", "obj_orig": "vet", "venue": null, "city": null, "region": null, "country": null}
+        {"msg": 1, "title": "Hiking", "fun": 0.8, "int": 0.6, "cat": "hike", "conf": 0.9, "com": true, "act": "hike", "act_orig": "hiking", "obj": null, "obj_orig": null, "venue": null, "city": "Mountains", "region": null, "country": null},
+        {"msg": 2, "title": "Vet visit", "fun": 0.1, "int": 0.2, "cat": "other", "conf": 0.85, "com": true, "act": "visit", "act_orig": "visit", "obj": "vet", "obj_orig": "vet", "venue": null, "city": null, "region": null, "country": null}
       ]`
 
       const parsed = parseClassificationResponse(response)
@@ -283,7 +281,7 @@ describe('Classifier Prompt', () => {
 
     it('handles response with markdown code block', () => {
       const response = `\`\`\`json
-[{"msg": 1, "title": "Beach day", "fun": 0.9, "int": 0.5, "cat": "nature", "conf": 0.95, "gen": true, "com": true, "act": "beach", "act_orig": "beach", "obj": null, "obj_orig": null, "venue": null, "city": "Malibu", "region": "California", "country": "USA"}]
+[{"msg": 1, "title": "Beach day", "fun": 0.9, "int": 0.5, "cat": "nature", "conf": 0.95, "com": true, "act": "beach", "act_orig": "beach", "obj": null, "obj_orig": null, "venue": null, "city": "Malibu", "region": "California", "country": "USA"}]
 \`\`\``
 
       const parsed = parseClassificationResponse(response)
@@ -295,7 +293,7 @@ describe('Classifier Prompt', () => {
     it('handles response with extra text around JSON', () => {
       const response = `Here is the classification:
 
-[{"msg": 1, "title": "Concert", "fun": 0.85, "int": 0.5, "cat": "concert", "conf": 0.9, "gen": false, "com": true, "act": "attend", "act_orig": "concert", "obj": "concert", "obj_orig": "concert", "venue": "Madison Square Garden", "city": "New York", "region": "NY", "country": "USA"}]
+[{"msg": 1, "title": "Concert", "fun": 0.85, "int": 0.5, "cat": "concert", "conf": 0.9, "com": true, "act": "attend", "act_orig": "concert", "obj": "concert", "obj_orig": "concert", "venue": "Madison Square Garden", "city": "New York", "region": "NY", "country": "USA"}]
 
 Hope this helps!`
 
@@ -306,7 +304,7 @@ Hope this helps!`
     })
 
     it('handles null location fields', () => {
-      const response = `[{"msg": 1, "title": "Something fun", "fun": 0.7, "int": 0.5, "cat": "other", "conf": 0.8, "gen": true, "com": true, "act": "do", "act_orig": "do", "obj": null, "obj_orig": null, "venue": null, "city": null, "region": null, "country": null}]`
+      const response = `[{"msg": 1, "title": "Something fun", "fun": 0.7, "int": 0.5, "cat": "other", "conf": 0.8, "com": true, "act": "do", "act_orig": "do", "obj": null, "obj_orig": null, "venue": null, "city": null, "region": null, "country": null}]`
 
       const parsed = parseClassificationResponse(response)
 
@@ -321,28 +319,27 @@ Hope this helps!`
       const parsed = parseClassificationResponse(response)
 
       // Defaults: gen=true, com=true
-      expect(parsed[0]?.gen).toBe(true)
       expect(parsed[0]?.com).toBe(true)
     })
 
     it('parses string-typed numbers (gpt-5-nano compatibility)', () => {
-      // Some models return numbers as strings
-      const response = `[{"msg": "168", "title": "Test", "fun": "0.85", "int": "0.5", "cat": "other", "conf": "0.9", "gen": true, "com": true}]`
+      // Some models return numbers as strings. Scores are 0-5 scale.
+      const response = `[{"msg": "168", "title": "Test", "fun": "4.25", "int": "3.5", "cat": "other", "conf": "0.9", "com": true}]`
 
       const parsed = parseClassificationResponse(response)
 
       expect(parsed[0]?.msg).toBe(168)
-      expect(parsed[0]?.fun).toBe(0.85)
+      expect(parsed[0]?.fun).toBe(4.3) // 4.25 rounds to 4.3
+      expect(parsed[0]?.int).toBe(3.5)
       expect(parsed[0]?.conf).toBe(0.9)
     })
 
     it('parses string-typed booleans', () => {
-      // Some models return booleans as strings
-      const response = `[{"msg": 1, "title": "Test", "fun": 0.5, "int": 0.5, "cat": "other", "conf": 0.5, "gen": "false", "com": "true"}]`
+      // Some models return booleans as strings. Scores are 0-5 scale.
+      const response = `[{"msg": 1, "title": "Test", "fun": 3.5, "int": 2.5, "cat": "other", "conf": 0.5, "gen": "false", "com": "true"}]`
 
       const parsed = parseClassificationResponse(response)
 
-      expect(parsed[0]?.gen).toBe(false)
       expect(parsed[0]?.com).toBe(true)
     })
 

src/classifier/prompt.ts

@@ -177,11 +177,10 @@ Return JSON array with ONLY activities worth saving. Skip non-activities entirel
   {
     "msg": <message_id>,
 ${offsetField}    "title": "<activity description, under 100 chars, fix any typos (e.g., 'ballon'→'balloon')>",
-    "fun": <0.0-1.0 how fun/enjoyable>,
-    "int": <0.0-1.0 how interesting/unique>,
+    "fun": <0.0-5.0 how fun/enjoyable>,
+    "int": <0.0-5.0 how interesting/unique>,
     "cat": "<category>",
     "conf": <0.0-1.0 your confidence>,
-    "gen": <true if generic, no specific venue/URL>,
     "com": <true if compound/complex activity that one JSON object can't fully represent>,
     "act": "<normalized action: go, hike, eat, watch, play, visit, etc. (always required)>",
     "act_orig": "<original action word>",
@@ -205,7 +204,7 @@ const SHARED_KEYWORDS_SECTION = `KEYWORDS (kw): Include up to 3 keywords for sto
 - DO NOT include any generic terms that may dilute the search query. For example, "play paintball" is a much better query WITHOUT generic keywords like "action, game, team" (which return images of football and basketball.) Include no keywords at all if the act/obj/venue are already specific.`
 
 function buildLocationSection(homeCountry: string): string {
-  return `LOCATION: Fill city/region/country if mentioned or obvious from context. For ambiguous names (e.g., "Omaha"), assume the user's home country (${homeCountry}). Venue can only be a specific place and not a general region.`
+  return `LOCATION: Only fill venue/city/region/country if explicitly mentioned or strongly implied. Do NOT default to the user's home country for generic activities like "watch a movie" or "play tennis". For ambiguous place names (e.g., "Omaha"), assume the user's home country (${homeCountry}). Venue can only be a specific place and not a general region.`
 }
 
 const SHARED_CATEGORIES_SECTION = `CATEGORIES: ${VALID_CATEGORIES.join(', ')}
@@ -266,9 +265,10 @@ ${SHARED_CATEGORIES_SECTION}
 ${SHARED_NORMALIZATION}
 
 EXAMPLES:
-- "Go tramping in Queenstown" → act:"hike", city:"Queenstown", gen:false
-- "Watch a movie" → act:"watch", obj:"movie", gen:true
-- "Go to Coffee Lab" → act:"visit", venue:"Coffee Lab", gen:false
+- "Go tramping in Queenstown" → act:"hike", city:"Queenstown"
+- "Take a cable car ride in San Francisco" → act:"ride", obj:"cable car", city:"San Francisco"
+- "Watch a movie" → act:"watch", obj:"movie"
+- "Go to Coffee Lab" → act:"visit", venue:"Coffee Lab"
 - "Let's visit Omaha" (user in NZ) → city:"Omaha", country:"New Zealand"
 - "Go to Iceland and see the aurora" → act:"travel", country:"Iceland", com:true (two activities: travel + aurora viewing)
 

src/classifier/response-parser.ts

@@ -9,13 +9,12 @@ export interface ParsedClassification {
   /** Message offset - 0 for suggestions, negative for agreements pointing to earlier messages */
   off: number
   title: string | null
-  /** How fun/enjoyable is this activity? 0=boring, 1=exciting */
+  /** How fun/enjoyable is this activity? 0.0-5.0 scale */
   fun: number
-  /** How interesting/unique is this activity? 0=common/mundane, 1=rare/novel */
+  /** How interesting/unique is this activity? 0.0-5.0 scale */
   int: number
   cat: string
   conf: number
-  gen: boolean
   com: boolean
   act: string | null
   act_orig: string | null
@@ -47,17 +46,23 @@ function parseString(val: unknown): string | null {
   return typeof val === 'string' && val.trim() ? val : null
 }
 
-function parseNumber(val: unknown, fallback: number, clamp = true): number {
+/** Round to N decimal places */
+function roundTo(n: number, decimals: number): number {
+  const factor = 10 ** decimals
+  return Math.round(n * factor) / factor
+}
+
+function parseNumber(val: unknown, fallback: number, max = 1, roundDecimals?: number): number {
+  let result = fallback
   if (typeof val === 'number') {
-    return clamp ? Math.max(0, Math.min(1, val)) : val
-  }
-  if (typeof val === 'string') {
+    result = Math.max(0, Math.min(max, val))
+  } else if (typeof val === 'string') {
     const parsed = Number.parseFloat(val)
     if (!Number.isNaN(parsed)) {
-      return clamp ? Math.max(0, Math.min(1, parsed)) : parsed
+      result = Math.max(0, Math.min(max, parsed))
     }
   }
-  return fallback
+  return roundDecimals !== undefined ? roundTo(result, roundDecimals) : result
 }
 
 function parseBoolean(val: unknown, fallback: boolean): boolean {
@@ -76,14 +81,13 @@ function parseStringArray(val: unknown): string[] {
 
 function parseItem(obj: Record<string, unknown>): ParsedClassification {
   return {
-    msg: parseNumber(obj.msg, 0, false), // msg is an ID, not clamped to 0-1
-    off: parseNumber(obj.off, 0, false), // offset, not clamped (usually 0 or negative)
+    msg: parseNumber(obj.msg, 0, Number.MAX_VALUE), // msg is an ID, not clamped
+    off: parseNumber(obj.off, 0, Number.MAX_VALUE), // offset, not clamped (usually 0 or negative)
     title: parseString(obj.title),
-    fun: parseNumber(obj.fun, 0.5),
-    int: parseNumber(obj.int, 0.5),
+    fun: parseNumber(obj.fun, 2.5, 5, 1), // 0-5 scale, 1 decimal
+    int: parseNumber(obj.int, 2.5, 5, 1), // 0-5 scale, 1 decimal
     cat: typeof obj.cat === 'string' ? obj.cat : 'other',
-    conf: parseNumber(obj.conf, 0.5),
-    gen: parseBoolean(obj.gen, true),
+    conf: parseNumber(obj.conf, 0.5, 1, 2), // 0-1 scale, 2 decimals (percentage)
     com: parseBoolean(obj.com, true),
     act: parseString(obj.act),
     act_orig: parseString(obj.act_orig),

src/cli/aggregation.test.ts

@@ -292,37 +292,39 @@ describe('Aggregation Module', () => {
     })
 
     it('averages funScore and interestingScore across merged activities', () => {
+      // Scores are 0-5 scale
       const act1 = createActivity({
         id: 1,
         activity: 'pottery class',
         action: 'take',
         object: 'class',
-        funScore: 0.8,
-        interestingScore: 0.6
+        funScore: 4.0,
+        interestingScore: 3.0
       })
       const act2 = createActivity({
         id: 2,
         activity: 'Pottery Class',
         action: 'take',
         object: 'class',
-        funScore: 0.6,
-        interestingScore: 0.4
+        funScore: 3.0,
+        interestingScore: 2.0
       })
       const act3 = createActivity({
         id: 3,
         activity: 'pottery classes',
         action: 'take',
         object: 'class',
-        funScore: 0.7,
-        interestingScore: 0.5
+        funScore: 3.5,
+        interestingScore: 2.5
       })
 
       const result = aggregateActivities([act1, act2, act3])
 
       expect(result).toHaveLength(1)
-      expect(result[0]?.funScore).toBe(0.7) // (0.8 + 0.6 + 0.7) / 3 = 0.7
-      expect(result[0]?.interestingScore).toBe(0.5) // (0.6 + 0.4 + 0.5) / 3 = 0.5
-      expect(result[0]?.score).toBe(1.7) // 0.5 * 2 + 0.7 = 1.7
+      expect(result[0]?.funScore).toBe(3.5) // (4.0 + 3.0 + 3.5) / 3 = 3.5
+      expect(result[0]?.interestingScore).toBe(2.5) // (3.0 + 2.0 + 2.5) / 3 = 2.5
+      // Combined score = (int * 2 + fun) / 3 = (2.5 * 2 + 3.5) / 3 = 2.8
+      expect(result[0]?.score).toBe(2.8)
     })
 
     it('keeps first occurrence as primary when merging', () => {

src/cli/aggregation.ts

@@ -7,7 +7,7 @@
  * This is an orchestrator concern (CLI), not core library.
  */
 
-import type { ClassifiedActivity } from '../types'
+import { type ClassifiedActivity, calculateCombinedScore } from '../types'
 
 /**
  * Normalize a string for comparison (lowercase, trim, collapse whitespace).
@@ -173,13 +173,13 @@ export function aggregateActivities(
       // Merge duplicates
       const allMessages = matches.flatMap((a) => a.messages)
 
-      // Average scores across all matches
-      const avgFunScore = round(matches.reduce((sum, a) => sum + a.funScore, 0) / matches.length, 2)
+      // Average scores across all matches (1 decimal place)
+      const avgFunScore = round(matches.reduce((sum, a) => sum + a.funScore, 0) / matches.length, 1)
       const avgInterestingScore = round(
         matches.reduce((sum, a) => sum + a.interestingScore, 0) / matches.length,
-        2
+        1
       )
-      const newScore = round(avgInterestingScore * 2 + avgFunScore, 1)
+      const newScore = calculateCombinedScore(avgFunScore, avgInterestingScore)
 
       // Create merged activity (primary keeps its fields, just update messages/scores)
       result.push({

src/cli/commands/classify.test.ts

@@ -31,7 +31,6 @@ describe('toOutputActivity', () => {
           message: 'We should do the Karangahake Gorge hike!'
         }
       ],
-      isGeneric: false,
       isCompound: false,
       action: 'hike',
       actionOriginal: 'hike',
@@ -60,7 +59,6 @@ describe('toOutputActivity', () => {
     expect(output.city).toBeNull()
     expect(output.region).toBeNull()
     expect(output.country).toBe('New Zealand')
-    expect(output.isGeneric).toBe(false)
     expect(output.isCompound).toBe(false)
     expect(output.interestingScore).toBe(0.8)
     expect(output.funScore).toBe(0.9)
@@ -152,7 +150,6 @@ describe('buildClassifyOutput', () => {
             message: "Let's go hiking"
           }
         ],
-        isGeneric: false,
         action: 'hike',
         actionOriginal: 'hiking',
         region: 'Alps',
@@ -188,7 +185,6 @@ describe('buildClassifyOutput', () => {
         activity: 'activity two',
         category: 'food',
         messages: [{ id: 2, sender: 'B', timestamp: new Date(), message: 'msg 2' }],
-        isGeneric: false,
         action: 'eat',
         actionOriginal: 'eat',
         venue: 'Some Restaurant',

src/cli/commands/classify.ts

@@ -31,7 +31,6 @@ export interface ClassifyOutputActivity {
   city: string | null
   region: string | null
   country: string | null
-  isGeneric: boolean
   isCompound: boolean
   interestingScore: number
   funScore: number
@@ -62,7 +61,6 @@ export function toOutputActivity(a: ClassifiedActivity): ClassifyOutputActivity
     city: a.city,
     region: a.region,
     country: a.country,
-    isGeneric: a.isGeneric,
     isCompound: a.isCompound,
     interestingScore: a.interestingScore,
     funScore: a.funScore