docker · glours · Apr 14, 2026 · Apr 14, 2026 · Copilot · Apr 14, 2026
@@ -278,6 +278,8 @@ type CreateOptions struct {
 	Timeout *time.Duration
 	// QuietPull makes the pulling process quiet
 	QuietPull bool
+	// SkipProviders skips provider services during convergence (e.g. watch rebuild)
+	SkipProviders bool
 }

 // StartOptions group options of the Start API

@@ -100,6 +100,12 @@ func (c *convergence) apply(ctx context.Context, project *types.Project, options
 			return err
 		}

+		// Skip provider services when the caller opted out (e.g. watch rebuild),
+		// since providers were already set up during initial "up".
+		if service.Provider != nil && options.SkipProviders {
+			return nil
+		}
+
 		return tracing.SpanWrapFunc("service/apply", tracing.ServiceOptions(service), func(ctx context.Context) error {
 			strategy := options.RecreateDependencies
 			if slices.Contains(options.Services, name) {

@@ -125,10 +125,10 @@ func (s *composeService) executePlugin(cmd *exec.Cmd, command string, service ty
 		}
 		switch msg.Type {
 		case ErrorType:
-			s.events.On(newEvent(service.Name, api.Error, msg.Message))
+			s.events.On(newEvent(service.Name, api.Error, firstLine(msg.Message)))
 			return nil, errors.New(msg.Message)
 		case InfoType:
-			s.events.On(newEvent(service.Name, api.Working, msg.Message))
+			s.events.On(newEvent(service.Name, api.Working, firstLine(msg.Message)))
 		case SetEnvType:
 			key, val, found := strings.Cut(msg.Message, "=")
 			if !found {
@@ -281,3 +281,12 @@ func (c CommandMetadata) CheckRequiredParameters(provider types.ServiceProviderC
 	}
 	return nil
 }
+
+// firstLine returns the first line of s, stripping any trailing newlines.
+func firstLine(s string) string {
+	s = strings.TrimRight(s, "\n")
+	if i := strings.IndexByte(s, '\n'); i >= 0 {
+		return s[:i]
-	s = strings.TrimRight(s, "\n")
-	if i := strings.IndexByte(s, '\n'); i >= 0 {
-		return s[:i]
+	s = strings.TrimRight(s, "\r\n")
+	if i := strings.IndexByte(s, '\n'); i >= 0 {
+		return strings.TrimRight(s[:i], "\r")
-	s = strings.TrimRight(s, "\n")
-	if i := strings.IndexByte(s, '\n'); i >= 0 {
-		return s[:i]
+	s = strings.TrimRight(s, "\r\n")
+	if i := strings.IndexByte(s, '\n'); i >= 0 {
+		return strings.TrimRight(s[:i], "\r")
+	}
+	return s
+}
@@ -662,9 +662,10 @@ func (s *composeService) rebuild(ctx context.Context, project *types.Project, se
 	options.LogTo.Log(api.WatchLogger, fmt.Sprintf("service(s) %q successfully built", services))

 	err = s.create(ctx, project, api.CreateOptions{
-		Services: services,
-		Inherit:  true,
-		Recreate: api.RecreateForce,
+		Services:      services,
+		Inherit:       true,
+		Recreate:      api.RecreateForce,
+		SkipProviders: true,
 	})
 	if err != nil {
 		options.LogTo.Log(api.WatchLogger, fmt.Sprintf("Failed to recreate services after update. Error: %v", err))
-Original file line number
+Diff line change
@@ -100,6 +100,12 @@ func (c *convergence) apply(ctx context.Context, project *types.Project, options
     			return err
     		}
+    		// Skip provider services when the caller opted out (e.g. watch rebuild),
+    		// since providers were already set up during initial "up".
+    		if service.Provider != nil && options.SkipProviders {
+    			return nil
+    		}
         Comment thread


        

        
      

        
            
      
      Comment on lines

    
      +103
     to 
      +107
    

  

  



  
    
        
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  
  
    
      

    
      Copilot
AI

    

    
    


      Apr 14, 2026


    

  



        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      New SkipProviders behavior is introduced here, but there doesn’t appear to be any test exercising convergence when provider services are present and SkipProviders is true. Given how central convergence is, adding a unit test that asserts provider services are not invoked (and dependent services still converge) would help prevent regressions.
    
  
  


      
        
      
    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


        
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

      


  
  
  




      
        Copilot uses AI. Check for mistakes.
     		return tracing.SpanWrapFunc("service/apply", tracing.ServiceOptions(service), func(ctx context.Context) error {
     			strategy := options.RecreateDependencies
     			if slices.Contains(options.Services, name) {
-          Expand Down