fix(agentic): never restate typed draft in ghost suggestions

Offline cold-start was returning full voice samples that already began
with the draft (e.g. \"kylrix is a…\"). Normalize all suggestions to a
true suffix before show/cache/AI strip.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: nathfavour

hooks/useMomentIntelligence.ts

@@ -13,6 +13,7 @@ import {
   recordAiInference,
   suggestOfflineReply,
 } from '@/lib/agentic/offline-complete';
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
 
 const loadSuggestCache = () => import('@/lib/agentic/suggestion-cache');
 
@@ -64,6 +65,12 @@ export function useMomentIntelligence(opts: {
   const [acceptStreak, setAcceptStreak] = useState(0);
   const [showWand, setShowWand] = useState(false);
 
+  const applySuggestion = useCallback((raw: string, forDraft: string) => {
+    const cleaned = asSuggestionSuffix(forDraft, raw);
+    setSuggestion(cleaned);
+    return cleaned;
+  }, []);
+
   const samplesRef = useRef<MomentVoiceSample[]>([]);
   const hintsRef = useRef<string[]>([]);
   const reqIdRef = useRef(0);
@@ -159,7 +166,7 @@ export function useMomentIntelligence(opts: {
         if (myReq !== reqIdRef.current) return;
         if (cached) {
           sourceRef.current = 'offline';
-          setSuggestion(cached);
+          applySuggestion(cached, draft);
           setBusy(false);
           return;
         }
@@ -189,15 +196,15 @@ export function useMomentIntelligence(opts: {
         if (source === 'offline') {
           sourceRef.current = 'offline';
           const text = offline.trim();
-          setSuggestion(text);
+          applySuggestion(text, draft);
           setBusy(false);
           if (text) void rememberSuggestion({ scope, userId, draft: cacheDraft, suggestion: text });
           return;
         }
 
         if (source !== 'ai' || !isPro) {
           sourceRef.current = 'offline';
-          setSuggestion(offline.trim());
+          applySuggestion(offline, draft);
           setBusy(false);
           if (offline.trim()) {
             void rememberSuggestion({ scope, userId, draft: cacheDraft, suggestion: offline.trim() });
@@ -223,7 +230,7 @@ export function useMomentIntelligence(opts: {
           if (!res.success) {
             if (String(res.error || '').toLowerCase().includes('pro')) onOpenPro();
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
             if (offline.trim()) {
               void rememberSuggestion({ scope, userId, draft: cacheDraft, suggestion: offline.trim() });
             }
@@ -232,19 +239,19 @@ export function useMomentIntelligence(opts: {
           const aiText = String(res.completion || '').trim();
           if (aiText) {
             sourceRef.current = 'ai';
-            setSuggestion(aiText);
+            applySuggestion(aiText, draft);
             void rememberSuggestion({ scope, userId, draft: cacheDraft, suggestion: aiText });
           } else {
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
             if (offline.trim()) {
               void rememberSuggestion({ scope, userId, draft: cacheDraft, suggestion: offline.trim() });
             }
           }
         } catch {
           if (myReq === reqIdRef.current) {
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
           }
         } finally {
           if (myReq === reqIdRef.current) setBusy(false);

hooks/useTypeIntelligence.ts

@@ -12,6 +12,7 @@ import {
   pickCompletionSource,
   recordAiInference,
 } from '@/lib/agentic/offline-complete';
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
 
 const loadSuggestCache = () => import('@/lib/agentic/suggestion-cache');
 
@@ -40,6 +41,11 @@ export function useTypeIntelligence(opts: {
 
   const [learningStatus, setLearningStatus] = useState<LearningStatus>('off');
   const [suggestion, setSuggestion] = useState('');
+  const applySuggestion = useCallback((raw: string, forDraft: string) => {
+    const cleaned = asSuggestionSuffix(forDraft, raw);
+    setSuggestion(cleaned);
+    return cleaned;
+  }, []);
   const [busy, setBusy] = useState(false);
   const [acceptStreak, setAcceptStreak] = useState(0);
   const [showWand, setShowWand] = useState(false);
@@ -102,7 +108,7 @@ export function useTypeIntelligence(opts: {
         if (myReq !== reqIdRef.current) return;
         if (cached) {
           sourceRef.current = 'offline';
-          setSuggestion(cached);
+          applySuggestion(cached, draft);
           setBusy(false);
           return;
         }
@@ -121,7 +127,7 @@ export function useTypeIntelligence(opts: {
         if (source === 'offline') {
           sourceRef.current = 'offline';
           const text = offline.trim();
-          setSuggestion(text);
+          applySuggestion(text, draft);
           setBusy(false);
           if (text) void rememberSuggestion({ scope, userId, draft, suggestion: text });
           return;
@@ -150,7 +156,7 @@ export function useTypeIntelligence(opts: {
           if (!res.success) {
             if (String(res.error || '').toLowerCase().includes('pro')) onOpenPro();
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
             if (offline.trim()) {
               void rememberSuggestion({ scope, userId, draft, suggestion: offline.trim() });
             }
@@ -159,19 +165,19 @@ export function useTypeIntelligence(opts: {
           const aiText = String(res.completion || '').trim();
           if (aiText) {
             sourceRef.current = 'ai';
-            setSuggestion(aiText);
+            applySuggestion(aiText, draft);
             void rememberSuggestion({ scope, userId, draft, suggestion: aiText });
           } else {
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
             if (offline.trim()) {
               void rememberSuggestion({ scope, userId, draft, suggestion: offline.trim() });
             }
           }
         } catch {
           if (myReq === reqIdRef.current) {
             sourceRef.current = 'offline';
-            setSuggestion(offline.trim());
+            applySuggestion(offline, draft);
           }
         } finally {
           if (myReq === reqIdRef.current) setBusy(false);

lib/actions/moment-doppelganger.ts

@@ -18,6 +18,8 @@ import {
 import { AI_REQUIRES_PRO_MESSAGE } from '@/lib/agentic/access';
 import { userHasPaidAiAccess } from '@/lib/server/ai-subscription-gate';
 
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
+
 async function getActor(jwt?: string) {
   const { getActor } = await import('./secure-ops');
   return getActor(jwt);
@@ -34,17 +36,13 @@ function cleanModelText(raw: string): string {
 
 function stripDraftPrefix(completion: string, draft: string): string {
   let out = cleanModelText(completion);
-  const d = draft.trim();
-  if (d && out.startsWith(d)) {
-    out = out.slice(d.length).replace(/^\s+/, '');
-  }
   if (out.startsWith('{')) {
     try {
       const j = JSON.parse(out);
       out = String(j.suffix || j.completion || j.post || j.text || '').trim() || out;
     } catch {}
   }
-  return out;
+  return asSuggestionSuffix(draft, out);
 }
 
 /**

lib/actions/type-intel.ts

@@ -19,6 +19,7 @@ import type { TypeIntelKind } from '@/lib/agentic/type-intel-kinds';
 import { TYPE_INTEL_KINDS } from '@/lib/agentic/type-intel-kinds';
 import { AI_REQUIRES_PRO_MESSAGE } from '@/lib/agentic/access';
 import { userHasPaidAiAccess } from '@/lib/server/ai-subscription-gate';
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
 
 async function getActor(jwt?: string) {
   const { getActor } = await import('./secure-ops');
@@ -36,17 +37,13 @@ function cleanModelText(raw: string): string {
 
 function stripDraftPrefix(completion: string, draft: string): string {
   let out = cleanModelText(completion);
-  const d = draft.trim();
-  if (d && out.startsWith(d)) {
-    out = out.slice(d.length).replace(/^\s+/, '');
-  }
   if (out.startsWith('{')) {
     try {
       const j = JSON.parse(out);
       out = String(j.suffix || j.completion || j.post || j.text || j.content || '').trim() || out;
     } catch {}
   }
-  return out;
+  return asSuggestionSuffix(draft, out);
 }
 
 function assertKind(kind: string): TypeIntelKind {

lib/agentic/offline-complete.ts

@@ -5,6 +5,7 @@
 
 import { predictiveAutocomplete } from '@/lib/contextual-engine/predictive-autocomplete';
 import type { ContextualNiche } from '@/lib/contextual-engine/types';
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
 
 const AI_ALLOW_RATIO = 0.4; // at most ~40% of fallbacks may hit AI
 const MIN_AI_GAP_MS = 14_000;
@@ -36,15 +37,17 @@ export function completeOfflineSuffix(
   const text = String(draft || '');
   if (text.trim().length < 2) return '';
 
+  const finish = (raw: string) => asSuggestionSuffix(text, raw);
+
   try {
     const pred = predictiveAutocomplete.predict(text, text.length, {
       niche: options.niche || 'productivity',
       minConfidence: options.minConfidence ?? 0.55,
     });
-    const inline = String(pred.inlineSuffix || '').trim();
+    const inline = finish(String(pred.inlineSuffix || ''));
     if (inline.length >= 2) return inline.slice(0, 120);
-    const top = pred.suggestions?.[0]?.text;
-    if (top && String(top).trim().length >= 2) return String(top).trim().slice(0, 120);
+    const top = finish(String(pred.suggestions?.[0]?.text || ''));
+    if (top.length >= 2) return top.slice(0, 120);
   } catch {}
 
   const words = text.trim().split(/\s+/);
@@ -54,23 +57,22 @@ export function completeOfflineSuffix(
       const body = String(s?.text || '');
       const idx = body.toLowerCase().indexOf(tail);
       if (idx >= 0) {
-        const rest = body.slice(idx + tail.length).replace(/^\s+/, '');
+        const rest = finish(body.slice(idx + tail.length));
         if (rest.length >= 4) return rest.slice(0, 100);
       }
     }
   }
 
-  // Weak cold-start: borrow a short fragment from a sample that shares a word
-  const lastWord = (words[words.length - 1] || '').toLowerCase().replace(/[^a-z0-9]/gi, '');
+  // Weak cold-start: only remainder after shared opening with draft (never restate draft)
+  const lastWord = (words[words.length - 1] || '').toLowerCase().replace(/[^a-z0-9']/gi, '');
   if (lastWord.length >= 4) {
     for (const s of samples) {
-      const body = String(s?.text || '');
-      if (body.toLowerCase().includes(lastWord)) {
-        const parts = body.split(/[.!?\n]/).map((p) => p.trim()).filter((p) => p.length > 12);
-        const pick = parts[0];
-        if (pick && !text.toLowerCase().includes(pick.toLowerCase().slice(0, 20))) {
-          return pick.slice(0, 80);
-        }
+      const body = String(s?.text || '').trim();
+      if (!body.toLowerCase().includes(lastWord)) continue;
+      const parts = body.split(/[.!?\n]/).map((p) => p.trim()).filter((p) => p.length > 12);
+      for (const pick of parts) {
+        const suffix = finish(pick);
+        if (suffix.length >= 4) return suffix.slice(0, 80);
       }
     }
   }
@@ -100,7 +102,6 @@ export function suggestOfflineReply(
     .map((s) => String(s?.text || '').trim())
     .filter((s) => s.length >= 8 && s.length <= 160);
 
-  // Prefer short sample replies that do not echo the parent verbatim
   for (const s of pool) {
     if (parent && parent.slice(0, 40).toLowerCase() === s.slice(0, 40).toLowerCase()) continue;
     if (/^(just shared|shared an update)/i.test(s)) continue;
@@ -109,7 +110,6 @@ export function suggestOfflineReply(
 
   if (!parent) return '';
 
-  // Soft topic hook from parent first words — restrained, not fake praise
   const topic = parent
     .replace(/\s+/g, ' ')
     .slice(0, 48)
@@ -160,9 +160,7 @@ export async function pickCompletionSource(opts: {
   allowAi: boolean;
 }): Promise<'offline' | 'ai' | 'none'> {
   if (opts.offlineSuffix.trim().length >= 2) {
-    // Even with offline hit, rarely skip to AI only if offline is tiny AND budget — prefer offline
     if (opts.offlineSuffix.trim().length >= 6) return 'offline';
-    // Short offline: still prefer offline 70%
     if (Math.random() < 0.7) return 'offline';
   }
   if (!opts.allowAi) return opts.offlineSuffix.trim() ? 'offline' : 'none';

lib/agentic/suggestion-cache.ts

@@ -3,6 +3,8 @@
  * Exact draft hits + near-prefix recovery. Persisted in LocalEngine per scope.
  */
 
+import { asSuggestionSuffix } from '@/lib/agentic/suggestion-suffix';
+
 const MAX_ENTRIES = 120;
 const TTL_MS = 1000 * 60 * 60 * 24 * 14; // 14 days
 const PREFIX_SLACK = 28; // chars deleted from end still reuse nearest longer/shorter hit
@@ -94,7 +96,7 @@ function pickBest(entries: CacheEntry[], draftNorm: string, kind: CacheEntry['ki
   if (bestLonger) {
     // Reconstruct: remaining typed chars from the longer draft + original suggestion
     const remainder = bestLonger.draft.slice(draftNorm.length);
-    const rebuilt = `${remainder}${bestLonger.suggestion}`;
+    const rebuilt = asSuggestionSuffix(draftNorm, `${remainder}${bestLonger.suggestion}`);
     if (rebuilt.trim().length >= 2) {
       return { ...bestLonger, draft: draftNorm, suggestion: rebuilt };
     }
@@ -111,8 +113,9 @@ function pickBest(entries: CacheEntry[], draftNorm: string, kind: CacheEntry['ki
     const sug = e.suggestion;
     if (sug.startsWith(extra) || sug.replace(/^\s+/, '').startsWith(extra.replace(/^\s+/, ''))) {
       const rest = sug.startsWith(extra) ? sug.slice(extra.length) : sug.replace(/^\s+/, '').slice(extra.replace(/^\s+/, '').length);
-      if (rest.trim().length >= 2) {
-        const candidate = { ...e, draft: draftNorm, suggestion: rest };
+      const cleaned = asSuggestionSuffix(draftNorm, rest);
+      if (cleaned.trim().length >= 2) {
+        const candidate = { ...e, draft: draftNorm, suggestion: cleaned };
         if (!bestShorter || e.draft.length > bestShorter.draft.length) bestShorter = candidate;
       }
     }
@@ -130,7 +133,9 @@ export async function lookupCachedSuggestion(opts: {
   if (draftNorm.length < 3) return null;
   const entries = await loadEntries(opts.scope, opts.userId);
   const hit = pickBest(entries, draftNorm, 'suffix');
-  return hit?.suggestion?.trim() ? hit.suggestion : null;
+  if (!hit?.suggestion?.trim()) return null;
+  const cleaned = asSuggestionSuffix(opts.draft, hit.suggestion);
+  return cleaned.trim() ? cleaned : null;
 }
 
 /** Persist a live suffix suggestion (offline or AI). */
@@ -141,7 +146,7 @@ export async function rememberSuggestion(opts: {
   suggestion: string;
 }): Promise<void> {
   const draftNorm = normalizeSuggestDraft(opts.draft);
-  const suggestion = String(opts.suggestion || '').trim();
+  const suggestion = asSuggestionSuffix(opts.draft, String(opts.suggestion || ''));
   if (draftNorm.length < 3 || suggestion.length < 2) return;
   const entries = await loadEntries(opts.scope, opts.userId);
   entries.unshift({