fix(daemon): harden Claude initial image seeding

Author: YOMXXX

server/internal/daemon/client.go

@@ -676,18 +676,12 @@ type AttachmentResponse struct {
 }
 
 func (c *Client) DownloadAttachment(ctx context.Context, attachmentID string) (*AttachmentResponse, []byte, error) {
-	var att AttachmentResponse
-	if err := c.getJSON(ctx, fmt.Sprintf("/api/attachments/%s", attachmentID), &att); err != nil {
-		return nil, nil, err
-	}
-	if att.DownloadURL == "" {
-		return nil, nil, fmt.Errorf("attachment %s has no download_url", attachmentID)
-	}
-	data, err := c.downloadFile(ctx, att.DownloadURL)
+	path := fmt.Sprintf("/api/attachments/%s/download", attachmentID)
+	data, err := c.downloadFile(ctx, path)
 	if err != nil {
 		return nil, nil, err
 	}
-	return &att, data, nil
+	return &AttachmentResponse{ID: attachmentID}, data, nil
 }
 
 func (c *Client) downloadFile(ctx context.Context, downloadURL string) ([]byte, error) {

server/internal/daemon/client_test.go

@@ -240,28 +240,19 @@ func TestDefaultTerminalRetrySchedule_MatchesAgreedPlan(t *testing.T) {
 	}
 }
 
-func TestClient_DownloadAttachmentDownloadsRelativeURLWithAuthHeaders(t *testing.T) {
+func TestClient_DownloadAttachmentUsesDownloadEndpointWithAuthHeaders(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
-		case "/api/attachments/att-1":
-			if got := r.Header.Get("Authorization"); got != "Bearer tok" {
-				t.Errorf("metadata request Authorization = %q, want Bearer tok", got)
-			}
-			w.Header().Set("Content-Type", "application/json")
-			json.NewEncoder(w).Encode(map[string]any{
-				"id":           "att-1",
-				"download_url": "/download/att-1",
-				"filename":     "shot.png",
-				"content_type": "image/png",
-			})
-		case "/download/att-1":
+		case "/api/attachments/att-1/download":
 			if got := r.Header.Get("Authorization"); got != "Bearer tok" {
-				t.Errorf("download request Authorization = %q, want Bearer tok", got)
+				t.Errorf("attachment download Authorization = %q, want Bearer tok", got)
 			}
 			if got := r.Header.Get("X-Client-Platform"); got != "daemon" {
-				t.Errorf("download request X-Client-Platform = %q, want daemon", got)
+				t.Errorf("attachment download X-Client-Platform = %q, want daemon", got)
 			}
 			w.Write([]byte("png-bytes"))
+		case "/api/attachments/att-1":
+			t.Fatal("DownloadAttachment must not fetch member-scoped attachment metadata")
 		default:
 			t.Errorf("unexpected path: %s", r.URL.Path)
 			http.NotFound(w, r)
@@ -276,7 +267,7 @@ func TestClient_DownloadAttachmentDownloadsRelativeURLWithAuthHeaders(t *testing
 	if err != nil {
 		t.Fatalf("DownloadAttachment: %v", err)
 	}
-	if meta.Filename != "shot.png" || meta.ContentType != "image/png" {
+	if meta.ID != "att-1" {
 		t.Fatalf("unexpected attachment metadata: %+v", meta)
 	}
 	if string(data) != "png-bytes" {

server/internal/daemon/daemon.go

@@ -3440,6 +3440,10 @@ const (
 	maxClaudeInitialImageBytes = 10 * 1024 * 1024
 )
 
+func shouldSeedClaudeInitialImages(provider string, task Task) bool {
+	return provider == "claude" && task.PriorSessionID == ""
+}
+
 func (d *Daemon) claudeInitialImages(ctx context.Context, task Task, taskLog *slog.Logger) []agent.InputImage {
 	attachments := make([]AttachmentMeta, 0, len(task.IssueAttachments)+len(task.ChatMessageAttachments))
 	attachments = append(attachments, task.IssueAttachments...)
@@ -3453,10 +3457,10 @@ func (d *Daemon) claudeInitialImages(ctx context.Context, task Task, taskLog *sl
 		if len(images) >= maxClaudeInitialImages {
 			break
 		}
-		if attachment.ID == "" || !strings.HasPrefix(strings.ToLower(attachment.ContentType), "image/") {
+		if attachment.ID == "" || !isClaudeInitialImageMediaType(attachment.ContentType) {
 			continue
 		}
-		meta, data, err := d.client.DownloadAttachment(ctx, attachment.ID)
+		_, data, err := d.client.DownloadAttachment(ctx, attachment.ID)
 		if err != nil {
 			taskLog.Warn("claude initial image download failed", "attachment_id", attachment.ID, "error", err)
 			continue
@@ -3466,16 +3470,7 @@ func (d *Daemon) claudeInitialImages(ctx context.Context, task Task, taskLog *sl
 			continue
 		}
 		mediaType := attachment.ContentType
-		if meta != nil && meta.ContentType != "" {
-			mediaType = meta.ContentType
-		}
-		if !strings.HasPrefix(strings.ToLower(mediaType), "image/") {
-			continue
-		}
 		filename := attachment.Filename
-		if meta != nil && meta.Filename != "" {
-			filename = meta.Filename
-		}
 		images = append(images, agent.InputImage{
 			Filename:  filename,
 			MediaType: mediaType,
@@ -3485,6 +3480,15 @@ func (d *Daemon) claudeInitialImages(ctx context.Context, task Task, taskLog *sl
 	return images
 }
 
+func isClaudeInitialImageMediaType(mediaType string) bool {
+	switch strings.ToLower(strings.TrimSpace(mediaType)) {
+	case "image/jpeg", "image/png", "image/gif", "image/webp":
+		return true
+	default:
+		return false
+	}
+}
+
 // gateResumeToReusedWorkdir clears the task's prior session unless the task
 // runs in the exact workdir the session was recorded against, and reports
 // whether that workdir was reused. CLI backends key their session stores to
@@ -4135,7 +4139,7 @@ func (d *Daemon) runTask(ctx context.Context, task Task, provider string, slot i
 		ThinkingLevel:             thinkingLevel,
 		OpenclawMode:              openclawMode,
 	}
-	if provider == "claude" {
+	if shouldSeedClaudeInitialImages(provider, task) {
 		execOpts.InitialImages = d.claudeInitialImages(ctx, task, taskLog)
 	}
 	// Some providers do not reliably load the per-task runtime config files we

server/internal/daemon/daemon_test.go

@@ -903,15 +903,7 @@ func TestClaudeInitialImagesDownloadsImageAttachments(t *testing.T) {
 
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
-		case "/api/attachments/img-1":
-			w.Header().Set("Content-Type", "application/json")
-			json.NewEncoder(w).Encode(map[string]any{
-				"id":           "img-1",
-				"download_url": "/files/img-1",
-				"filename":     "server-shot.png",
-				"content_type": "image/png",
-			})
-		case "/files/img-1":
+		case "/api/attachments/img-1/download":
 			w.Write([]byte("image-bytes"))
 		default:
 			http.NotFound(w, r)
@@ -931,11 +923,52 @@ func TestClaudeInitialImagesDownloadsImageAttachments(t *testing.T) {
 		t.Fatalf("initial images length = %d, want 1", len(images))
 	}
 	got := images[0]
-	if got.Filename != "server-shot.png" || got.MediaType != "image/png" || string(got.Data) != "image-bytes" {
+	if got.Filename != "client-shot.png" || got.MediaType != "image/png" || string(got.Data) != "image-bytes" {
 		t.Fatalf("unexpected initial image: %+v data=%q", got, string(got.Data))
 	}
 }
 
+func TestClaudeInitialImagesSkipsUnsupportedImageTypes(t *testing.T) {
+	t.Parallel()
+
+	var downloadCalled atomic.Bool
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		downloadCalled.Store(true)
+		w.Write([]byte("image-bytes"))
+	}))
+	t.Cleanup(srv.Close)
+
+	d := &Daemon{client: NewClient(srv.URL), logger: slog.Default()}
+	images := d.claudeInitialImages(context.Background(), Task{
+		IssueAttachments: []AttachmentMeta{
+			{ID: "svg-1", Filename: "diagram.svg", ContentType: "image/svg+xml"},
+			{ID: "bmp-1", Filename: "bitmap.bmp", ContentType: "image/bmp"},
+			{ID: "ico-1", Filename: "favicon.ico", ContentType: "image/x-icon"},
+		},
+	}, slog.New(slog.NewTextHandler(io.Discard, nil)))
+
+	if len(images) != 0 {
+		t.Fatalf("initial images length = %d, want 0", len(images))
+	}
+	if downloadCalled.Load() {
+		t.Fatal("unsupported image attachments should be skipped before download")
+	}
+}
+
+func TestShouldSeedClaudeInitialImagesOnlyForColdClaudeTasks(t *testing.T) {
+	t.Parallel()
+
+	if !shouldSeedClaudeInitialImages("claude", Task{}) {
+		t.Fatal("cold Claude task should seed initial images")
+	}
+	if shouldSeedClaudeInitialImages("claude", Task{PriorSessionID: "sess-123"}) {
+		t.Fatal("resumed Claude task should not seed initial images")
+	}
+	if shouldSeedClaudeInitialImages("codex", Task{}) {
+		t.Fatal("non-Claude task should not seed initial images")
+	}
+}
+
 func TestMergeUsage(t *testing.T) {
 	t.Parallel()