Improve thought enrichment reliability

internal/tools/capture.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
-	"golang.org/x/sync/errgroup"
 
 	"git.warky.dev/wdevs/amcs/internal/ai"
 	"git.warky.dev/wdevs/amcs/internal/config"
@@ -58,52 +57,10 @@ func (t *CaptureTool) Handle(ctx context.Context, req *mcp.CallToolRequest, in C
 		return nil, CaptureOutput{}, err
 	}
 
-	var embedding []float32
 	rawMetadata := metadata.Fallback(t.capture)
-	metadataNeedsRetry := false
-	embeddingNeedsRetry := false
-
-	group, groupCtx := errgroup.WithContext(ctx)
-	group.Go(func() error {
-		vector, err := t.provider.Embed(groupCtx, content)
-		if err != nil {
-			t.log.Warn("embedding failed, thought will be saved without embedding",
-				slog.String("provider", t.provider.Name()),
-				slog.String("error", err.Error()),
-			)
-			embeddingNeedsRetry = true
-			return nil
-		}
-		embedding = vector
-		return nil
-	})
-	group.Go(func() error {
-		metaCtx := groupCtx
-		attemptedAt := time.Now().UTC()
-		if t.metadataTimeout > 0 {
-			var cancel context.CancelFunc
-			metaCtx, cancel = context.WithTimeout(groupCtx, t.metadataTimeout)
-			defer cancel()
-		}
-		extracted, err := t.provider.ExtractMetadata(metaCtx, content)
-		if err != nil {
-			t.log.Warn("metadata extraction failed, using fallback", slog.String("provider", t.provider.Name()), slog.String("error", err.Error()))
-			rawMetadata = metadata.MarkMetadataPending(rawMetadata, t.capture, attemptedAt, err)
-			metadataNeedsRetry = true
-			return nil
-		}
-		rawMetadata = metadata.MarkMetadataComplete(extracted, t.capture, attemptedAt)
-		return nil
-	})
-
-	if err := group.Wait(); err != nil {
-		return nil, CaptureOutput{}, err
-	}
-
 	thought := thoughttypes.Thought{
-		Content:   content,
-		Embedding: embedding,
-		Metadata:  metadata.Normalize(metadata.SanitizeExtracted(rawMetadata), t.capture),
+		Content:  content,
+		Metadata: rawMetadata,
 	}
 	if project != nil {
 		thought.ProjectID = &project.ID
@@ -116,12 +73,57 @@ func (t *CaptureTool) Handle(ctx context.Context, req *mcp.CallToolRequest, in C
 	if project != nil {
 		_ = t.store.TouchProject(ctx, project.ID)
 	}
-	if metadataNeedsRetry && t.retryer != nil {
-		t.retryer.QueueThought(created.ID)
-	}
-	if embeddingNeedsRetry && t.embedRetryer != nil {
-		t.embedRetryer.QueueThought(ctx, created.ID, content)
+
+	if t.retryer != nil || t.embedRetryer != nil {
+		t.launchEnrichment(created.ID, content)
 	}
 
 	return nil, CaptureOutput{Thought: created}, nil
 }
+
+func (t *CaptureTool) launchEnrichment(id uuid.UUID, content string) {
+	go func() {
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+		defer cancel()
+
+		if t.retryer != nil {
+			attemptedAt := time.Now().UTC()
+			rawMetadata := metadata.Fallback(t.capture)
+			extracted, err := t.provider.ExtractMetadata(ctx, content)
+			if err != nil {
+				failed := metadata.MarkMetadataFailed(rawMetadata, t.capture, attemptedAt, err)
+				if _, updateErr := t.store.UpdateThoughtMetadata(ctx, id, failed); updateErr != nil {
+					t.log.Warn("deferred metadata failure could not be persisted",
+						slog.String("thought_id", id.String()),
+						slog.String("error", updateErr.Error()),
+					)
+				}
+				t.log.Warn("deferred metadata extraction failed",
+					slog.String("thought_id", id.String()),
+					slog.String("provider", t.provider.Name()),
+					slog.String("error", err.Error()),
+				)
+				t.retryer.QueueThought(id)
+			} else {
+				completed := metadata.MarkMetadataComplete(extracted, t.capture, attemptedAt)
+				if _, updateErr := t.store.UpdateThoughtMetadata(ctx, id, completed); updateErr != nil {
+					t.log.Warn("deferred metadata completion could not be persisted",
+						slog.String("thought_id", id.String()),
+						slog.String("error", updateErr.Error()),
+					)
+				}
+			}
+		}
+
+		if t.embedRetryer != nil {
+			if _, err := t.provider.Embed(ctx, content); err != nil {
+				t.log.Warn("deferred embedding failed",
+					slog.String("thought_id", id.String()),
+					slog.String("provider", t.provider.Name()),
+					slog.String("error", err.Error()),
+				)
+			}
+			t.embedRetryer.QueueThought(ctx, id, content)
+		}
+	}()
+}