environment_run: improve prompts for better accuracy (#143)

Signed-off-by: Andrea Luzzardi <[email protected]>

Author: aluzzardi

environment/environment.go

@@ -312,6 +312,9 @@ func (env *Environment) RunBackground(ctx context.Context, command, shell string
 		if errors.As(err, &exitErr) {
 			return nil, fmt.Errorf("command failed with exit code %d.\nstdout: %s\nstderr: %s", exitErr.ExitCode, exitErr.Stdout, exitErr.Stderr)
 		}
+		if errors.Is(err, context.DeadlineExceeded) {
+			return nil, fmt.Errorf("service failed to start within %s timeout", serviceStartTimeout)
+		}
 		return nil, err
 	}
 
@@ -335,14 +338,17 @@ func (env *Environment) RunBackground(ctx context.Context, command, shell string
 			return nil, err
 		}
 
-		externalEndpoint, err := tunnel.Endpoint(ctx, dagger.ServiceEndpointOpts{})
+		externalEndpoint, err := tunnel.Endpoint(ctx, dagger.ServiceEndpointOpts{
+			Scheme: "tcp",
+		})
 		if err != nil {
 			return nil, err
 		}
 		endpoint.HostExternal = externalEndpoint
 
 		internalEndpoint, err := svc.Endpoint(ctx, dagger.ServiceEndpointOpts{
-			Port: port,
+			Port:   port,
+			Scheme: "tcp",
 		})
 		if err != nil {
 			return nil, err

environment/service.go

@@ -75,13 +75,16 @@ func (env *Environment) startService(ctx context.Context, cfg *ServiceConfig) (*
 		if errors.As(err, &exitErr) {
 			return nil, fmt.Errorf("command failed with exit code %d.\nstdout: %s\nstderr: %s", exitErr.ExitCode, exitErr.Stdout, exitErr.Stderr)
 		}
+		if errors.Is(err, context.DeadlineExceeded) {
+			return nil, fmt.Errorf("service failed to start within %s timeout", serviceStartTimeout)
+		}
 		return nil, err
 	}
 
 	endpoints := EndpointMappings{}
 	for _, port := range cfg.ExposedPorts {
 		endpoint := &EndpointMapping{
-			EnvironmentInternal: fmt.Sprintf("%s:%d", cfg.Name, port),
+			EnvironmentInternal: fmt.Sprintf("tcp://%s:%d", cfg.Name, port),
 		}
 		endpoints[port] = endpoint
 
@@ -99,7 +102,9 @@ func (env *Environment) startService(ctx context.Context, cfg *ServiceConfig) (*
 			return nil, err
 		}
 
-		externalEndpoint, err := tunnel.Endpoint(ctx, dagger.ServiceEndpointOpts{})
+		externalEndpoint, err := tunnel.Endpoint(ctx, dagger.ServiceEndpointOpts{
+			Scheme: "tcp",
+		})
 		if err != nil {
 			return nil, fmt.Errorf("failed to get endpoint for service %s: %w", cfg.Name, err)
 		}

mcpserver/tools.go

@@ -412,7 +412,7 @@ var EnvironmentListTool = &Tool{
 
 var EnvironmentRunCmdTool = &Tool{
 	Definition: mcp.NewTool("environment_run_cmd",
-		mcp.WithDescription("Run a terminal command inside the environment."),
+		mcp.WithDescription("Run a terminal command inside a NEW container within the environment."),
 		mcp.WithString("explanation",
 			mcp.Description("One sentence explanation for why this command is being run."),
 		),
@@ -482,7 +482,9 @@ Failure to do so will result in the tool being stuck, awaiting for the command t
 				return nil, err
 			}
 
-			return mcp.NewToolResultText(fmt.Sprintf(`Command started in the background. Endpoints are %s
+			return mcp.NewToolResultText(fmt.Sprintf(`Command started in the background in NEW container. Endpoints are %s
+
+To access from the user's machine: use host_external. To access from other commands in this environment: use environment_internal.
 
 Any changes to the container workdir (%s) WILL NOT be committed to container-use/%s
 
@@ -744,7 +746,7 @@ var EnvironmentAddServiceTool = &Tool{
 			mcp.Description("The command to start the service. If not provided the image default command will be used."),
 		),
 		mcp.WithArray("ports",
-			mcp.Description("Ports to expose. For each port, returns the environment_internal (for use by environments) and external (for use by the user) address."),
+			mcp.Description("Ports to expose. For each port, returns the container_internal (for use by environments) and host_external (for use by the user) address."),
 			mcp.Items(map[string]any{"type": "number"}),
 		),
 		mcp.WithArray("envs",